diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f288702..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - 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/README.md b/README.md index 1edb827..6f3b095 100644 --- a/README.md +++ b/README.md @@ -1,61 +1,32 @@ - # 👨🏽‍💻 AASTU Students App v3 +# AASTU STUDENTS -![Dart Version](https://img.shields.io/badge/Dart-3.5-blue) -![Flutter Version](https://img.shields.io/badge/Flutter-3.24.2-blue) -![FlutterFlow Version](https://img.shields.io/badge/FlutterFlow-5.0.13%2B-blue) +A new Flutter project. -Welcome to the third iteration of the AASTU Students App—a productivity and social networking platform tailored for the students of Addis Ababa Science and Technology University. Unlike previous versions, this release is built using [FlutterFlow](https://flutterflow.io/), a Flutter-based UI framework, enhancing both development efficiency and user experience. +## Getting Started -## Features +FlutterFlow projects are built to run on the Flutter _stable_ release. -- **Productivity Tools**: Access academic resources, schedules, and reminders. -- **Social Networking**: Connect with peers, join groups, and participate in campus events. -- **User-Friendly Interface**: Designed with an intuitive UI for seamless navigation. +## Integration Tests -## Getting Started +To test on a real iOS / Android device, first connect the device and run the following command from the root of the project: + +```bash +flutter test integration_test/test.dart +``` + +To test on a web browser, first launch `chromedriver` as follows: +```bash +chromedriver --port=4444 +``` + +Then from the root of the project, run the following command: +```bash +flutter drive \ + --driver=test_driver/integration_test.dart \ + --target=integration_test/test.dart \ + -d chrome +``` + +Find more information about running Flutter integration tests [here](https://docs.flutter.dev/cookbook/testing/integration/introduction#5-run-the-integration-test). -To run this project locally: - -1. **Clone the Repository**: - ``` - git clone https://github.com/gemechis-elias/aastu-students-app-v3.git - ``` -2. **Navigate to the Project Directory**: - ``` - cd aastu-students-app-v3 - ``` -3. **Install Dependencies**: - ``` - flutter pub get - ``` -4. **Run the App**: - ``` - flutter run - ``` - -**Note**: Ensure that you have Dart 3.5 and Flutter 3.24.2 installed on your machine. - -## Contribution Guidelines - -We welcome contributions to enhance the app: - -1. **Fork the Project**: Click on the 'Fork' button at the top right corner of this repository. -2. **Clone Your Fork**: - ``` - git clone https://github.com/your-username/aastu-students-app-v3.git - ``` -3. **Create a New Branch**: - ``` - git checkout -b feature/your-feature-name - ``` -4. **Develop Your Feature**: Implement your changes locally. -5. **Submit a Ticket**: For feature suggestions or bug fixes, create an issue ticket detailing your changes. -6. **Provide Flutter Code**: Attach the relevant Flutter code snippets demonstrating the working feature. - -*Please Note*: This app is built using FlutterFlow. Currently, we are unable to share collaboration access on FlutterFlow. Therefore, while we appreciate your code contributions, our team will integrate them into FlutterFlow to maintain consistency. - -## 🤎 Support and Sponsorship - -Your support helps us improve and maintain the app. If you find this project useful, please consider sponsoring us. [Sponsor this project](https://github.com/sponsors/gemechis-elias) - -Thank you for contributing to the AASTU Students App and supporting the student community at Addis Ababa Science and Technology University. +Refer to this guide for instructions on running the tests on [Firebase Test Lab](https://github.com/flutter/flutter/tree/main/packages/integration_test#firebase-test-lab). diff --git a/android/app/google-services.json b/android/app/google-services.json deleted file mode 100644 index ac6e623..0000000 --- a/android/app/google-services.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "project_info": { - "project_number": "187180178121", - "project_id": "aastu-students-demo", - "storage_bucket": "aastu-students-demo.firebasestorage.app" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:187180178121:android:fb3b27aaf4d63eaae98b18", - "android_client_info": { - "package_name": "com.horansoftware.aastu" - } - }, - "oauth_client": [], - "api_key": [ - { - "current_key": "AIzaSyA0GWKm_cpxDJhMy-rlW0R7uVjZoMHd5PE" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [] - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/assets/images/81ANaVZk5LL._SL1500_.jpg b/assets/images/81ANaVZk5LL._SL1500_.jpg deleted file mode 100644 index 5b2aead..0000000 Binary files a/assets/images/81ANaVZk5LL._SL1500_.jpg and /dev/null differ diff --git a/assets/images/error.png b/assets/images/error.png new file mode 100644 index 0000000..f7a41dc Binary files /dev/null and b/assets/images/error.png differ diff --git a/assets/images/learning-how-to-learn-barbara-oakley.webp b/assets/images/learning-how-to-learn-barbara-oakley.webp deleted file mode 100644 index 2b8987e..0000000 Binary files a/assets/images/learning-how-to-learn-barbara-oakley.webp and /dev/null differ diff --git a/assets/images/photo_2022-06-25_22-45-23.jpg b/assets/images/photo_2022-06-25_22-45-23.jpg deleted file mode 100644 index 70f619d..0000000 Binary files a/assets/images/photo_2022-06-25_22-45-23.jpg and /dev/null differ diff --git a/assets/images/photo_2022-06-26_17-53-24.jpg b/assets/images/photo_2022-06-26_17-53-24.jpg deleted file mode 100644 index 39aeb9e..0000000 Binary files a/assets/images/photo_2022-06-26_17-53-24.jpg and /dev/null differ diff --git a/assets/images/photo_2022-06-26_19-40-17.jpg b/assets/images/photo_2022-06-26_19-40-17.jpg deleted file mode 100644 index 0fe1e20..0000000 Binary files a/assets/images/photo_2022-06-26_19-40-17.jpg and /dev/null differ diff --git a/assets/images/photo_2022-06-26_19-40-29.jpg b/assets/images/photo_2022-06-26_19-40-29.jpg deleted file mode 100644 index 0849af8..0000000 Binary files a/assets/images/photo_2022-06-26_19-40-29.jpg and /dev/null differ diff --git a/assets/images/photo_2024-06-28_22-18-53.jpg b/assets/images/photo_2024-06-28_22-18-53.jpg deleted file mode 100644 index 4264a94..0000000 Binary files a/assets/images/photo_2024-06-28_22-18-53.jpg and /dev/null differ diff --git a/firebase/firestore.indexes.json b/firebase/firestore.indexes.json index e1c66f9..9764c53 100644 --- a/firebase/firestore.indexes.json +++ b/firebase/firestore.indexes.json @@ -69,6 +69,48 @@ "order": "DESCENDING" } ] + }, + { + "collectionGroup": "books", + "queryScope": "COLLECTION", + "fields": [ + { + "fieldPath": "is_recently_added", + "order": "ASCENDING" + }, + { + "fieldPath": "createdAt", + "order": "DESCENDING" + } + ] + }, + { + "collectionGroup": "books", + "queryScope": "COLLECTION", + "fields": [ + { + "fieldPath": "is_featured", + "order": "ASCENDING" + }, + { + "fieldPath": "createdAt", + "order": "ASCENDING" + } + ] + }, + { + "collectionGroup": "books", + "queryScope": "COLLECTION", + "fields": [ + { + "fieldPath": "category", + "order": "ASCENDING" + }, + { + "fieldPath": "createdAt", + "order": "DESCENDING" + } + ] } ] } \ No newline at end of file diff --git a/firebase/firestore.rules b/firebase/firestore.rules index eef424d..2c0f2cb 100644 --- a/firebase/firestore.rules +++ b/firebase/firestore.rules @@ -16,22 +16,22 @@ service cloud.firestore { } match /postComments/{document} { - allow create: if true; - allow read: if true; + allow create: if request.auth != null; + allow read: if request.auth != null; allow write: if resource.data.user == /databases/$(database)/documents/users/$(request.auth.uid); allow delete: if false; } match /userStories/{document} { - allow create: if true; - allow read: if true; + allow create: if request.auth != null; + allow read: if request.auth != null; allow write: if resource.data.user == /databases/$(database)/documents/users/$(request.auth.uid); allow delete: if false; } match /storyComments/{document} { - allow create: if true; - allow read: if true; + allow create: if request.auth != null; + allow read: if request.auth != null; allow write: if resource.data.commentUser == /databases/$(database)/documents/users/$(request.auth.uid); allow delete: if resource.data.commentUser == /databases/$(database)/documents/users/$(request.auth.uid); } @@ -44,22 +44,22 @@ service cloud.firestore { } match /friends/{document} { - allow create: if true; - allow read: if true; - allow write: if true; - allow delete: if true; + allow create: if request.auth != null; + allow read: if request.auth != null; + allow write: if request.auth != null; + allow delete: if request.auth != null; } match /chats/{document} { - allow create: if true; - allow read: if true; + allow create: if request.auth != null; + allow read: if request.auth != null; allow write: if /databases/$(database)/documents/users/$(request.auth.uid) in resource.data.users; allow delete: if resource.data.user_a == /databases/$(database)/documents/users/$(request.auth.uid); } match /chat_messages/{document} { - allow create: if true; - allow read: if true; + allow create: if request.auth != null; + allow read: if request.auth != null; allow write: if resource.data.user == /databases/$(database)/documents/users/$(request.auth.uid); allow delete: if resource.data.user == /databases/$(database)/documents/users/$(request.auth.uid); } @@ -159,9 +159,16 @@ service cloud.firestore { } match /userPreferences/{document} { - allow create: if true; - allow read: if true; - allow write: if false; + allow create: if request.auth != null; + allow read: if request.auth != null; + allow write: if request.auth != null; + allow delete: if false; + } + + match /books/{document} { + allow create: if request.auth != null; + allow read: if request.auth != null; + allow write: if request.auth != null; allow delete: if false; } } diff --git a/firebase/functions/package.json b/firebase/functions/package.json index 9017343..25dda45 100644 --- a/firebase/functions/package.json +++ b/firebase/functions/package.json @@ -18,10 +18,10 @@ }, "scripts": { "lint": "./node_modules/.bin/eslint --max-warnings=0 .", - "serve": "firebase -P aastu-students-demo emulators:start --only functions", - "shell": "firebase -P aastu-students-demo functions:shell", + "serve": "firebase -P emulators:start --only functions", + "shell": "firebase -P functions:shell", "start": "npm run shell", - "logs": "firebase -P aastu-students-demo functions:log", + "logs": "firebase -P functions:log", "compile": "cp ../../tsconfig.template.json ./tsconfig-compile.json && tsc --project tsconfig-compile.json" }, "engines": { diff --git a/ios/Podfile b/ios/Podfile index 9354804..8f4bfd9 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -32,7 +32,6 @@ target 'Runner' do use_modular_headers! flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) - pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '11.2.0' end post_install do |installer| diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index f07bc84..40d5a21 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,18 +3,16 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 44A671D52BC7AFBA0042F967 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 44A671D42BC7AFBA0042F967 /* PrivacyInfo.xcprivacy */; }; - 60CEEDB492F577A653BC6E45 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8285832C7E7A3262A5A897C /* Pods_Runner.framework */; }; - 6426BE1225AC0EBD0080CC2A /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6426BE1125AC0EBD0080CC2A /* GoogleService-Info.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 6436409A27A31CD800820AF7 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6436409C27A31CD800820AF7 /* InfoPlist.strings */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; /* End PBXBuildFile section */ @@ -37,9 +35,6 @@ 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 44A671D42BC7AFBA0042F967 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; - 64E3CA8B26FC10FF0070C5E0 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; - 3DCE399542E9B8C63BEA38E6 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; - 6426BE1125AC0EBD0080CC2A /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -50,9 +45,6 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A9C17DEFA21738E5FBD7F54A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; - B8285832C7E7A3262A5A897C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - FA9015B13AC8FF8CBD8DD673 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -60,24 +52,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 60CEEDB492F577A653BC6E45 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 33098FC5D2106DCB44CAEA79 /* Pods */ = { - isa = PBXGroup; - children = ( - FA9015B13AC8FF8CBD8DD673 /* Pods-Runner.debug.xcconfig */, - A9C17DEFA21738E5FBD7F54A /* Pods-Runner.release.xcconfig */, - 3DCE399542E9B8C63BEA38E6 /* Pods-Runner.profile.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -95,8 +75,6 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - 33098FC5D2106DCB44CAEA79 /* Pods */, - CC79BB5F4B7E86C62E930C2C /* Frameworks */, ); sourceTree = ""; }; @@ -111,8 +89,6 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( - 64E3CA8B26FC10FF0070C5E0 /* Runner.entitlements */, - 6426BE1125AC0EBD0080CC2A /* GoogleService-Info.plist */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, @@ -127,14 +103,6 @@ path = Runner; sourceTree = ""; }; - CC79BB5F4B7E86C62E930C2C /* Frameworks */ = { - isa = PBXGroup; - children = ( - B8285832C7E7A3262A5A897C /* Pods_Runner.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -142,14 +110,11 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 3EA46EF11B42FC3BFF6A4BBC /* [CP] Check Pods Manifest.lock */, - 9705A1C41CF9048500538489 /* Embed Frameworks */, - 55067970987309DE09E9DE72 /* [CP] Copy Pods Resources */, - 2838A0ADC44730F0A2303575 /* [CP] Embed Pods Frameworks */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, ); buildRules = ( @@ -203,7 +168,6 @@ 44A671D52BC7AFBA0042F967 /* PrivacyInfo.xcprivacy in Resources */, 6436409A27A31CD800820AF7 /* InfoPlist.strings in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 6426BE1225AC0EBD0080CC2A /* GoogleService-Info.plist in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); @@ -212,23 +176,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 2838A0ADC44730F0A2303575 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -243,45 +190,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 3EA46EF11B42FC3BFF6A4BBC /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 55067970987309DE09E9DE72 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -392,11 +300,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -404,10 +310,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -520,8 +423,7 @@ MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -531,11 +433,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -543,10 +443,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", @@ -564,11 +461,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -576,10 +471,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Flutter", diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist deleted file mode 100644 index cc39758..0000000 --- a/ios/Runner/GoogleService-Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - API_KEY - AIzaSyBKRU8Kdi9ENUcEZLo2dQV-5tueoyCfHo4 - GCM_SENDER_ID - 187180178121 - PLIST_VERSION - 1 - BUNDLE_ID - com.horansoftware.aastu - PROJECT_ID - aastu-students-demo - STORAGE_BUCKET - aastu-students-demo.firebasestorage.app - IS_ADS_ENABLED - - IS_ANALYTICS_ENABLED - - IS_APPINVITE_ENABLED - - IS_GCM_ENABLED - - IS_SIGNIN_ENABLED - - GOOGLE_APP_ID - 1:187180178121:ios:5e8febc03172974be98b18 - - \ No newline at end of file diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 88c6769..29cb102 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -22,18 +22,7 @@ CFBundleSignature ???? CFBundleURLTypes - - - CFBundleTypeRole - Editor - CFBundleURLSchemes - - - - - - - + CFBundleTypeRole Editor CFBundleURLName diff --git a/lib/archive_pages/create_dog_profile/create_dog_profile_model.dart b/lib/archive_pages/create_dog_profile/create_dog_profile_model.dart index 6fb7dda..bf7d109 100644 --- a/lib/archive_pages/create_dog_profile/create_dog_profile_model.dart +++ b/lib/archive_pages/create_dog_profile/create_dog_profile_model.dart @@ -5,6 +5,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import 'create_dog_profile_widget.dart' show CreateDogProfileWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/archive_pages/create_dog_profile/create_dog_profile_widget.dart b/lib/archive_pages/create_dog_profile/create_dog_profile_widget.dart index bc7df7f..d2a92c3 100644 --- a/lib/archive_pages/create_dog_profile/create_dog_profile_widget.dart +++ b/lib/archive_pages/create_dog_profile/create_dog_profile_widget.dart @@ -5,6 +5,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/archive_pages/create_dog_profile_new/create_dog_profile_new_model.dart b/lib/archive_pages/create_dog_profile_new/create_dog_profile_new_model.dart index 599b6e7..bb1b773 100644 --- a/lib/archive_pages/create_dog_profile_new/create_dog_profile_new_model.dart +++ b/lib/archive_pages/create_dog_profile_new/create_dog_profile_new_model.dart @@ -6,6 +6,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import 'create_dog_profile_new_widget.dart' show CreateDogProfileNewWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/archive_pages/create_dog_profile_new/create_dog_profile_new_widget.dart b/lib/archive_pages/create_dog_profile_new/create_dog_profile_new_widget.dart index fbac0f6..1fd0f81 100644 --- a/lib/archive_pages/create_dog_profile_new/create_dog_profile_new_widget.dart +++ b/lib/archive_pages/create_dog_profile_new/create_dog_profile_new_widget.dart @@ -6,6 +6,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/archive_pages/edit_dog_profile/edit_dog_profile_model.dart b/lib/archive_pages/edit_dog_profile/edit_dog_profile_model.dart index 190e545..6b388c3 100644 --- a/lib/archive_pages/edit_dog_profile/edit_dog_profile_model.dart +++ b/lib/archive_pages/edit_dog_profile/edit_dog_profile_model.dart @@ -6,6 +6,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import 'edit_dog_profile_widget.dart' show EditDogProfileWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/archive_pages/edit_dog_profile/edit_dog_profile_widget.dart b/lib/archive_pages/edit_dog_profile/edit_dog_profile_widget.dart index c76dfbf..05f0826 100644 --- a/lib/archive_pages/edit_dog_profile/edit_dog_profile_widget.dart +++ b/lib/archive_pages/edit_dog_profile/edit_dog_profile_widget.dart @@ -6,6 +6,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/backend/backend.dart b/lib/backend/backend.dart index 3a1433e..ef170d0 100644 --- a/lib/backend/backend.dart +++ b/lib/backend/backend.dart @@ -27,6 +27,7 @@ import 'schema/premium_accounts_record.dart'; import 'schema/developers_record.dart'; import 'schema/deleted_users_record.dart'; import 'schema/user_preferences_record.dart'; +import 'schema/books_record.dart'; import 'dart:async'; import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart'; @@ -59,6 +60,7 @@ export 'schema/premium_accounts_record.dart'; export 'schema/developers_record.dart'; export 'schema/deleted_users_record.dart'; export 'schema/user_preferences_record.dart'; +export 'schema/books_record.dart'; /// Functions to query UserPostsRecords (as a Stream and as a Future). Future queryUserPostsRecordCount({ @@ -1788,6 +1790,84 @@ Future> queryUserPreferencesRecordPage({ return page; }); +/// Functions to query BooksRecords (as a Stream and as a Future). +Future queryBooksRecordCount({ + Query Function(Query)? queryBuilder, + int limit = -1, +}) => + queryCollectionCount( + BooksRecord.collection, + queryBuilder: queryBuilder, + limit: limit, + ); + +Stream> queryBooksRecord({ + Query Function(Query)? queryBuilder, + int limit = -1, + bool singleRecord = false, +}) => + queryCollection( + BooksRecord.collection, + BooksRecord.fromSnapshot, + queryBuilder: queryBuilder, + limit: limit, + singleRecord: singleRecord, + ); + +Future> queryBooksRecordOnce({ + Query Function(Query)? queryBuilder, + int limit = -1, + bool singleRecord = false, +}) => + queryCollectionOnce( + BooksRecord.collection, + BooksRecord.fromSnapshot, + queryBuilder: queryBuilder, + limit: limit, + singleRecord: singleRecord, + ); +Future> queryBooksRecordPage({ + Query Function(Query)? queryBuilder, + DocumentSnapshot? nextPageMarker, + required int pageSize, + required bool isStream, + required PagingController controller, + List? streamSubscriptions, +}) => + queryCollectionPage( + BooksRecord.collection, + BooksRecord.fromSnapshot, + queryBuilder: queryBuilder, + nextPageMarker: nextPageMarker, + pageSize: pageSize, + isStream: isStream, + ).then((page) { + controller.appendPage( + page.data, + page.nextPageMarker, + ); + if (isStream) { + final streamSubscription = + (page.dataStream)?.listen((List data) { + data.forEach((item) { + final itemIndexes = controller.itemList! + .asMap() + .map((k, v) => MapEntry(v.reference.id, k)); + final index = itemIndexes[item.reference.id]; + final items = controller.itemList!; + if (index != null) { + items.replaceRange(index, index + 1, [item]); + controller.itemList = { + for (var item in items) item.reference: item + }.values.toList(); + } + }); + }); + streamSubscriptions?.add(streamSubscription); + } + return page; + }); + Future queryCollectionCount( Query collection, { Query Function(Query)? queryBuilder, diff --git a/lib/backend/firebase/firebase_config.dart b/lib/backend/firebase/firebase_config.dart index a0546c0..e1ca4c3 100644 --- a/lib/backend/firebase/firebase_config.dart +++ b/lib/backend/firebase/firebase_config.dart @@ -1,18 +1,5 @@ import 'package:firebase_core/firebase_core.dart'; -import 'package:flutter/foundation.dart'; Future initFirebase() async { - if (kIsWeb) { - await Firebase.initializeApp( - options: FirebaseOptions( - apiKey: "AIzaSyDFVlmnfCW3Ds9uTwNthWVESDg8gh4Xcz8", - authDomain: "aastu-students-demo.firebaseapp.com", - projectId: "aastu-students-demo", - storageBucket: "aastu-students-demo.firebasestorage.app", - messagingSenderId: "187180178121", - appId: "1:187180178121:web:ab9de4827e315637e98b18", - measurementId: "G-6KVGPC89QY")); - } else { - await Firebase.initializeApp(); - } + await Firebase.initializeApp(); } diff --git a/lib/backend/schema/books_record.dart b/lib/backend/schema/books_record.dart new file mode 100644 index 0000000..60313f7 --- /dev/null +++ b/lib/backend/schema/books_record.dart @@ -0,0 +1,198 @@ +import 'dart:async'; + +import 'package:collection/collection.dart'; + +import '/backend/schema/util/firestore_util.dart'; +import '/backend/schema/util/schema_util.dart'; + +import 'index.dart'; +import '/flutter_flow/flutter_flow_util.dart'; + +class BooksRecord extends FirestoreRecord { + BooksRecord._( + DocumentReference reference, + Map data, + ) : super(reference, data) { + _initializeFields(); + } + + // "id" field. + String? _id; + String get id => _id ?? ''; + bool hasId() => _id != null; + + // "title" field. + String? _title; + String get title => _title ?? ''; + bool hasTitle() => _title != null; + + // "image_link" field. + String? _imageLink; + String get imageLink => _imageLink ?? ''; + bool hasImageLink() => _imageLink != null; + + // "short_description" field. + String? _shortDescription; + String get shortDescription => _shortDescription ?? ''; + bool hasShortDescription() => _shortDescription != null; + + // "long_description" field. + String? _longDescription; + String get longDescription => _longDescription ?? ''; + bool hasLongDescription() => _longDescription != null; + + // "download_url" field. + String? _downloadUrl; + String get downloadUrl => _downloadUrl ?? ''; + bool hasDownloadUrl() => _downloadUrl != null; + + // "category" field. + String? _category; + String get category => _category ?? ''; + bool hasCategory() => _category != null; + + // "is_featured" field. + bool? _isFeatured; + bool get isFeatured => _isFeatured ?? false; + bool hasIsFeatured() => _isFeatured != null; + + // "is_recently_added" field. + bool? _isRecentlyAdded; + bool get isRecentlyAdded => _isRecentlyAdded ?? false; + bool hasIsRecentlyAdded() => _isRecentlyAdded != null; + + // "rating" field. + double? _rating; + double get rating => _rating ?? 0.0; + bool hasRating() => _rating != null; + + // "createdAt" field. + DateTime? _createdAt; + DateTime? get createdAt => _createdAt; + bool hasCreatedAt() => _createdAt != null; + + // "photo_blur_hash" field. + String? _photoBlurHash; + String get photoBlurHash => _photoBlurHash ?? ''; + bool hasPhotoBlurHash() => _photoBlurHash != null; + + void _initializeFields() { + _id = snapshotData['id'] as String?; + _title = snapshotData['title'] as String?; + _imageLink = snapshotData['image_link'] as String?; + _shortDescription = snapshotData['short_description'] as String?; + _longDescription = snapshotData['long_description'] as String?; + _downloadUrl = snapshotData['download_url'] as String?; + _category = snapshotData['category'] as String?; + _isFeatured = snapshotData['is_featured'] as bool?; + _isRecentlyAdded = snapshotData['is_recently_added'] as bool?; + _rating = castToType(snapshotData['rating']); + _createdAt = snapshotData['createdAt'] as DateTime?; + _photoBlurHash = snapshotData['photo_blur_hash'] as String?; + } + + static CollectionReference get collection => + FirebaseFirestore.instance.collection('books'); + + static Stream getDocument(DocumentReference ref) => + ref.snapshots().map((s) => BooksRecord.fromSnapshot(s)); + + static Future getDocumentOnce(DocumentReference ref) => + ref.get().then((s) => BooksRecord.fromSnapshot(s)); + + static BooksRecord fromSnapshot(DocumentSnapshot snapshot) => BooksRecord._( + snapshot.reference, + mapFromFirestore(snapshot.data() as Map), + ); + + static BooksRecord getDocumentFromData( + Map data, + DocumentReference reference, + ) => + BooksRecord._(reference, mapFromFirestore(data)); + + @override + String toString() => + 'BooksRecord(reference: ${reference.path}, data: $snapshotData)'; + + @override + int get hashCode => reference.path.hashCode; + + @override + bool operator ==(other) => + other is BooksRecord && + reference.path.hashCode == other.reference.path.hashCode; +} + +Map createBooksRecordData({ + String? id, + String? title, + String? imageLink, + String? shortDescription, + String? longDescription, + String? downloadUrl, + String? category, + bool? isFeatured, + bool? isRecentlyAdded, + double? rating, + DateTime? createdAt, + String? photoBlurHash, +}) { + final firestoreData = mapToFirestore( + { + 'id': id, + 'title': title, + 'image_link': imageLink, + 'short_description': shortDescription, + 'long_description': longDescription, + 'download_url': downloadUrl, + 'category': category, + 'is_featured': isFeatured, + 'is_recently_added': isRecentlyAdded, + 'rating': rating, + 'createdAt': createdAt, + 'photo_blur_hash': photoBlurHash, + }.withoutNulls, + ); + + return firestoreData; +} + +class BooksRecordDocumentEquality implements Equality { + const BooksRecordDocumentEquality(); + + @override + bool equals(BooksRecord? e1, BooksRecord? e2) { + return e1?.id == e2?.id && + e1?.title == e2?.title && + e1?.imageLink == e2?.imageLink && + e1?.shortDescription == e2?.shortDescription && + e1?.longDescription == e2?.longDescription && + e1?.downloadUrl == e2?.downloadUrl && + e1?.category == e2?.category && + e1?.isFeatured == e2?.isFeatured && + e1?.isRecentlyAdded == e2?.isRecentlyAdded && + e1?.rating == e2?.rating && + e1?.createdAt == e2?.createdAt && + e1?.photoBlurHash == e2?.photoBlurHash; + } + + @override + int hash(BooksRecord? e) => const ListEquality().hash([ + e?.id, + e?.title, + e?.imageLink, + e?.shortDescription, + e?.longDescription, + e?.downloadUrl, + e?.category, + e?.isFeatured, + e?.isRecentlyAdded, + e?.rating, + e?.createdAt, + e?.photoBlurHash + ]); + + @override + bool isValidKey(Object? o) => o is BooksRecord; +} diff --git a/lib/backend/schema/user_stories_record.dart b/lib/backend/schema/user_stories_record.dart index 205c424..526612a 100644 --- a/lib/backend/schema/user_stories_record.dart +++ b/lib/backend/schema/user_stories_record.dart @@ -66,6 +66,11 @@ class UserStoriesRecord extends FirestoreRecord { String get uid => _uid ?? ''; bool hasUid() => _uid != null; + // "expiredDate" field. + DateTime? _expiredDate; + DateTime? get expiredDate => _expiredDate; + bool hasExpiredDate() => _expiredDate != null; + void _initializeFields() { _user = snapshotData['user'] as DocumentReference?; _storyVideo = snapshotData['storyVideo'] as String?; @@ -77,6 +82,7 @@ class UserStoriesRecord extends FirestoreRecord { _isOwner = snapshotData['isOwner'] as bool?; _photoBlurHash = snapshotData['photo_blur_hash'] as String?; _uid = snapshotData['uid'] as String?; + _expiredDate = snapshotData['expiredDate'] as DateTime?; } static CollectionReference get collection => @@ -123,6 +129,7 @@ Map createUserStoriesRecordData({ bool? isOwner, String? photoBlurHash, String? uid, + DateTime? expiredDate, }) { final firestoreData = mapToFirestore( { @@ -135,6 +142,7 @@ Map createUserStoriesRecordData({ 'isOwner': isOwner, 'photo_blur_hash': photoBlurHash, 'uid': uid, + 'expiredDate': expiredDate, }.withoutNulls, ); @@ -156,7 +164,8 @@ class UserStoriesRecordDocumentEquality implements Equality { e1?.numComments == e2?.numComments && e1?.isOwner == e2?.isOwner && e1?.photoBlurHash == e2?.photoBlurHash && - e1?.uid == e2?.uid; + e1?.uid == e2?.uid && + e1?.expiredDate == e2?.expiredDate; } @override @@ -170,7 +179,8 @@ class UserStoriesRecordDocumentEquality implements Equality { e?.numComments, e?.isOwner, e?.photoBlurHash, - e?.uid + e?.uid, + e?.expiredDate ]); @override diff --git a/lib/book_upload/book_upload_model.dart b/lib/book_upload/book_upload_model.dart new file mode 100644 index 0000000..c0c8a8a --- /dev/null +++ b/lib/book_upload/book_upload_model.dart @@ -0,0 +1,89 @@ +import '/auth/firebase_auth/auth_util.dart'; +import '/backend/backend.dart'; +import '/backend/firebase_storage/storage.dart'; +import '/flutter_flow/flutter_flow_icon_button.dart'; +import '/flutter_flow/flutter_flow_theme.dart'; +import '/flutter_flow/flutter_flow_util.dart'; +import '/flutter_flow/flutter_flow_widgets.dart'; +import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; +import 'book_upload_widget.dart' show BookUploadWidget; +import 'dart:async'; +import 'package:cloud_firestore/cloud_firestore.dart'; +import 'package:flutter/material.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:provider/provider.dart'; + +class BookUploadModel extends FlutterFlowModel { + /// State fields for stateful widgets in this page. + + // State field(s) for TextField widget. + FocusNode? textFieldFocusNode1; + TextEditingController? textController1; + String? Function(BuildContext, String?)? textController1Validator; + bool isDataUploading = false; + FFUploadedFile uploadedLocalFile = + FFUploadedFile(bytes: Uint8List.fromList([])); + String uploadedFileUrl = ''; + + // State field(s) for TextField widget. + FocusNode? textFieldFocusNode2; + TextEditingController? textController2; + String? Function(BuildContext, String?)? textController2Validator; + // State field(s) for TextField widget. + FocusNode? textFieldFocusNode3; + TextEditingController? textController3; + String? Function(BuildContext, String?)? textController3Validator; + // State field(s) for TextField widget. + FocusNode? textFieldFocusNode4; + TextEditingController? textController4; + String? Function(BuildContext, String?)? textController4Validator; + // State field(s) for TextField widget. + FocusNode? textFieldFocusNode5; + TextEditingController? textController5; + String? Function(BuildContext, String?)? textController5Validator; + // State field(s) for Switch widget. + bool? switchValue1; + // State field(s) for Switch widget. + bool? switchValue2; + // Stores action output result for [Backend Call - Create Document] action in Button widget. + BooksRecord? createdBook; + Completer>? firestoreRequestCompleter; + + @override + void initState(BuildContext context) {} + + @override + void dispose() { + textFieldFocusNode1?.dispose(); + textController1?.dispose(); + + textFieldFocusNode2?.dispose(); + textController2?.dispose(); + + textFieldFocusNode3?.dispose(); + textController3?.dispose(); + + textFieldFocusNode4?.dispose(); + textController4?.dispose(); + + textFieldFocusNode5?.dispose(); + textController5?.dispose(); + } + + /// Additional helper methods. + Future waitForFirestoreRequestCompleted({ + double minWait = 0, + double maxWait = double.infinity, + }) async { + final stopwatch = Stopwatch()..start(); + while (true) { + await Future.delayed(Duration(milliseconds: 50)); + final timeElapsed = stopwatch.elapsedMilliseconds; + final requestComplete = firestoreRequestCompleter?.isCompleted ?? false; + if (timeElapsed > maxWait || (requestComplete && timeElapsed > minWait)) { + break; + } + } + } +} diff --git a/lib/book_upload/book_upload_widget.dart b/lib/book_upload/book_upload_widget.dart new file mode 100644 index 0000000..4a116bc --- /dev/null +++ b/lib/book_upload/book_upload_widget.dart @@ -0,0 +1,858 @@ +import '/auth/firebase_auth/auth_util.dart'; +import '/backend/backend.dart'; +import '/backend/firebase_storage/storage.dart'; +import '/flutter_flow/flutter_flow_icon_button.dart'; +import '/flutter_flow/flutter_flow_theme.dart'; +import '/flutter_flow/flutter_flow_util.dart'; +import '/flutter_flow/flutter_flow_widgets.dart'; +import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; +import 'dart:async'; +import 'package:cloud_firestore/cloud_firestore.dart'; +import 'package:flutter/material.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:provider/provider.dart'; +import 'book_upload_model.dart'; +export 'book_upload_model.dart'; + +class BookUploadWidget extends StatefulWidget { + const BookUploadWidget({super.key}); + + @override + State createState() => _BookUploadWidgetState(); +} + +class _BookUploadWidgetState extends State { + late BookUploadModel _model; + + final scaffoldKey = GlobalKey(); + + @override + void initState() { + super.initState(); + _model = createModel(context, () => BookUploadModel()); + + _model.textController1 ??= TextEditingController(); + _model.textFieldFocusNode1 ??= FocusNode(); + + _model.textController2 ??= TextEditingController(); + _model.textFieldFocusNode2 ??= FocusNode(); + + _model.textController3 ??= TextEditingController(); + _model.textFieldFocusNode3 ??= FocusNode(); + + _model.textController4 ??= TextEditingController(); + _model.textFieldFocusNode4 ??= FocusNode(); + + _model.textController5 ??= TextEditingController(); + _model.textFieldFocusNode5 ??= FocusNode(); + + _model.switchValue1 = true; + _model.switchValue2 = true; + WidgetsBinding.instance.addPostFrameCallback((_) => safeSetState(() {})); + } + + @override + void dispose() { + _model.dispose(); + + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, + child: Scaffold( + key: scaffoldKey, + backgroundColor: FlutterFlowTheme.of(context).secondaryBackground, + appBar: responsiveVisibility( + context: context, + tabletLandscape: false, + desktop: false, + ) + ? AppBar( + backgroundColor: + FlutterFlowTheme.of(context).secondaryBackground, + automaticallyImplyLeading: false, + leading: FlutterFlowIconButton( + borderRadius: 8.0, + buttonSize: 40.0, + icon: Icon( + Icons.arrow_back_rounded, + color: FlutterFlowTheme.of(context).primaryText, + size: 24.0, + ), + onPressed: () { + print('IconButton pressed ...'); + }, + ), + title: Text( + 'Upload Book', + style: FlutterFlowTheme.of(context).headlineMedium.override( + fontFamily: 'Outfit', + letterSpacing: 0.0, + ), + ), + actions: [], + centerTitle: false, + elevation: 0.0, + ) + : null, + body: SafeArea( + top: true, + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB(24.0, 24.0, 24.0, 24.0), + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Material( + color: Colors.transparent, + elevation: 2.0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16.0), + ), + child: Container( + width: MediaQuery.sizeOf(context).width * 1.0, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context).primaryBackground, + borderRadius: BorderRadius.circular(16.0), + ), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 24.0, 24.0, 24.0, 24.0), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Text( + 'Book Details', + style: FlutterFlowTheme.of(context) + .headlineSmall + .override( + fontFamily: 'Outfit', + color: FlutterFlowTheme.of(context) + .primaryText, + letterSpacing: 0.0, + ), + ), + TextFormField( + controller: _model.textController1, + focusNode: _model.textFieldFocusNode1, + autofocus: false, + obscureText: false, + decoration: InputDecoration( + labelText: 'Book Title', + labelStyle: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + hintStyle: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0xFFE0E0E0), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + errorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + focusedErrorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + filled: true, + fillColor: Colors.white, + ), + style: FlutterFlowTheme.of(context) + .bodyLarge + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + minLines: 1, + validator: _model.textController1Validator + .asValidator(context), + ), + Container( + width: MediaQuery.sizeOf(context).width * 1.0, + height: 200.0, + decoration: BoxDecoration( + color: Color(0xFFE0E0E0), + borderRadius: BorderRadius.circular(8.0), + ), + child: Stack( + children: [ + ClipRRect( + borderRadius: BorderRadius.circular(8.0), + child: Image.network( + 'https://images.unsplash.com/photo-1675684977462-1ae40532ba8d?w=500&h=500', + width: MediaQuery.sizeOf(context).width * + 1.0, + height: + MediaQuery.sizeOf(context).height * + 1.0, + fit: BoxFit.cover, + ), + ), + Container( + width: + MediaQuery.sizeOf(context).width * 1.0, + height: + MediaQuery.sizeOf(context).height * 1.0, + decoration: BoxDecoration( + color: Color(0x33000000), + ), + child: Padding( + padding: EdgeInsets.all(16.0), + child: InkWell( + splashColor: Colors.transparent, + focusColor: Colors.transparent, + hoverColor: Colors.transparent, + highlightColor: Colors.transparent, + onTap: () async { + final selectedMedia = + await selectMediaWithSourceBottomSheet( + context: context, + allowPhoto: true, + includeBlurHash: true, + ); + if (selectedMedia != null && + selectedMedia.every((m) => + validateFileFormat( + m.storagePath, + context))) { + safeSetState(() => + _model.isDataUploading = true); + var selectedUploadedFiles = + []; + + var downloadUrls = []; + try { + selectedUploadedFiles = + selectedMedia + .map( + (m) => FFUploadedFile( + name: m + .storagePath + .split('/') + .last, + bytes: m.bytes, + height: m + .dimensions + ?.height, + width: m + .dimensions + ?.width, + blurHash: + m.blurHash, + )) + .toList(); + + downloadUrls = (await Future.wait( + selectedMedia.map( + (m) async => await uploadData( + m.storagePath, m.bytes), + ), + )) + .where((u) => u != null) + .map((u) => u!) + .toList(); + } finally { + _model.isDataUploading = false; + } + if (selectedUploadedFiles.length == + selectedMedia.length && + downloadUrls.length == + selectedMedia.length) { + safeSetState(() { + _model.uploadedLocalFile = + selectedUploadedFiles.first; + _model.uploadedFileUrl = + downloadUrls.first; + }); + } else { + safeSetState(() {}); + return; + } + } + }, + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: + MainAxisAlignment.center, + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + Icon( + Icons.add_photo_alternate, + color: Colors.white, + size: 40.0, + ), + Text( + 'Upload Book Cover', + style: + FlutterFlowTheme.of(context) + .bodyLarge + .override( + fontFamily: 'Figtree', + color: Colors.white, + letterSpacing: 0.0, + ), + ), + ], + ), + ), + ), + ), + ], + ), + ), + TextFormField( + controller: _model.textController2, + focusNode: _model.textFieldFocusNode2, + autofocus: false, + obscureText: false, + decoration: InputDecoration( + labelText: 'Short Description', + labelStyle: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + hintStyle: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0xFFE0E0E0), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + errorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + focusedErrorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + filled: true, + fillColor: Colors.white, + ), + style: FlutterFlowTheme.of(context) + .bodyLarge + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + maxLines: 2, + minLines: 2, + validator: _model.textController2Validator + .asValidator(context), + ), + TextFormField( + controller: _model.textController3, + focusNode: _model.textFieldFocusNode3, + autofocus: false, + obscureText: false, + decoration: InputDecoration( + labelText: 'Long Description', + labelStyle: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + hintStyle: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0xFFE0E0E0), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + errorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + focusedErrorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + filled: true, + fillColor: Colors.white, + ), + style: FlutterFlowTheme.of(context) + .bodyLarge + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + maxLines: 8, + minLines: 4, + validator: _model.textController3Validator + .asValidator(context), + ), + TextFormField( + controller: _model.textController4, + focusNode: _model.textFieldFocusNode4, + autofocus: false, + obscureText: false, + decoration: InputDecoration( + labelText: 'Download URL', + labelStyle: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + hintStyle: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0xFFE0E0E0), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + errorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + focusedErrorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + filled: true, + fillColor: Colors.white, + ), + style: FlutterFlowTheme.of(context) + .bodyLarge + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + minLines: 1, + keyboardType: TextInputType.url, + validator: _model.textController4Validator + .asValidator(context), + ), + TextFormField( + controller: _model.textController5, + focusNode: _model.textFieldFocusNode5, + autofocus: false, + obscureText: false, + decoration: InputDecoration( + labelText: 'Category', + labelStyle: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + hintStyle: FlutterFlowTheme.of(context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0xFFE0E0E0), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + errorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + focusedErrorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 1.0, + ), + borderRadius: BorderRadius.circular(8.0), + ), + filled: true, + fillColor: Colors.white, + ), + style: FlutterFlowTheme.of(context) + .bodyLarge + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + minLines: 1, + validator: _model.textController5Validator + .asValidator(context), + ), + Container( + width: MediaQuery.sizeOf(context).width * 1.0, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8.0), + border: Border.all( + color: Color(0xFFE0E0E0), + width: 1.0, + ), + ), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 16.0, 16.0, 16.0, 16.0), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Featured Book', + style: FlutterFlowTheme.of(context) + .bodyLarge + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + ), + Switch( + value: _model.switchValue1!, + onChanged: (newValue) async { + safeSetState(() => _model + .switchValue1 = newValue!); + }, + activeColor: + FlutterFlowTheme.of(context) + .primary, + activeTrackColor: + FlutterFlowTheme.of(context) + .secondaryText, + inactiveTrackColor: + FlutterFlowTheme.of(context) + .secondaryText, + inactiveThumbColor: Color(0xFFE0E0E0), + ), + ], + ), + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Text( + 'Recently Added', + style: FlutterFlowTheme.of(context) + .bodyLarge + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + ), + Switch( + value: _model.switchValue2!, + onChanged: (newValue) async { + safeSetState(() => _model + .switchValue2 = newValue!); + }, + activeColor: + FlutterFlowTheme.of(context) + .primary, + activeTrackColor: + FlutterFlowTheme.of(context) + .secondaryText, + inactiveTrackColor: + FlutterFlowTheme.of(context) + .secondaryText, + inactiveThumbColor: Color(0xFFE0E0E0), + ), + ], + ), + ].divide(SizedBox(height: 16.0)), + ), + ), + ), + FFButtonWidget( + onPressed: () async { + var booksRecordReference = + BooksRecord.collection.doc(); + await booksRecordReference + .set(createBooksRecordData()); + _model.createdBook = + BooksRecord.getDocumentFromData( + createBooksRecordData(), + booksRecordReference); + + await _model.createdBook!.reference + .update(createBooksRecordData( + id: _model.createdBook?.reference.id, + title: _model.textController1.text, + imageLink: _model.uploadedFileUrl, + shortDescription: _model.textController2.text, + longDescription: _model.textController3.text, + downloadUrl: _model.textController4.text, + category: _model.textController5.text, + isFeatured: _model.switchValue1, + isRecentlyAdded: _model.switchValue2, + rating: 5.0, + createdAt: getCurrentTimestamp, + photoBlurHash: + _model.uploadedLocalFile.blurHash, + )); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text( + 'Book is Added', + style: TextStyle( + color: FlutterFlowTheme.of(context) + .primaryText, + ), + ), + duration: Duration(milliseconds: 4000), + backgroundColor: + FlutterFlowTheme.of(context).secondary, + ), + ); + + safeSetState(() {}); + }, + text: 'Upload Book', + icon: Icon( + Icons.cloud_upload, + color: FlutterFlowTheme.of(context).info, + size: 24.0, + ), + options: FFButtonOptions( + width: MediaQuery.sizeOf(context).width * 1.0, + height: 56.0, + padding: EdgeInsetsDirectional.fromSTEB( + 0.0, 0.0, 0.0, 0.0), + iconPadding: EdgeInsetsDirectional.fromSTEB( + 0.0, 0.0, 0.0, 0.0), + color: FlutterFlowTheme.of(context).primary, + textStyle: FlutterFlowTheme.of(context) + .titleLarge + .override( + fontFamily: 'Outfit', + color: FlutterFlowTheme.of(context).info, + letterSpacing: 0.0, + ), + elevation: 3.0, + borderRadius: BorderRadius.circular(28.0), + ), + ), + ].divide(SizedBox(height: 24.0)), + ), + ), + ), + ), + Container( + width: double.infinity, + height: 250.0, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context).secondaryBackground, + ), + child: FutureBuilder>( + future: (_model.firestoreRequestCompleter ??= + Completer>() + ..complete(queryBooksRecordOnce( + queryBuilder: (booksRecord) => booksRecord + .orderBy('createdAt', descending: true), + limit: 20, + ))) + .future, + builder: (context, snapshot) { + // Customize what your widget looks like when it's loading. + if (!snapshot.hasData) { + return Center( + child: SizedBox( + width: 50.0, + height: 50.0, + child: CircularProgressIndicator( + valueColor: AlwaysStoppedAnimation( + FlutterFlowTheme.of(context).primary, + ), + ), + ), + ); + } + List listViewBooksRecordList = + snapshot.data!; + if (listViewBooksRecordList.isEmpty) { + return Image.asset( + 'assets/images/error.png', + ); + } + + return ListView.separated( + padding: EdgeInsets.zero, + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: listViewBooksRecordList.length, + separatorBuilder: (_, __) => SizedBox(width: 14.0), + itemBuilder: (context, listViewIndex) { + final listViewBooksRecord = + listViewBooksRecordList[listViewIndex]; + return Container( + width: 180.0, + height: 100.0, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context) + .secondaryBackground, + ), + child: Stack( + children: [ + ClipRRect( + borderRadius: BorderRadius.circular(8.0), + child: Image.network( + listViewBooksRecord.imageLink, + width: double.infinity, + height: double.infinity, + fit: BoxFit.cover, + ), + ), + InkWell( + splashColor: Colors.transparent, + focusColor: Colors.transparent, + hoverColor: Colors.transparent, + highlightColor: Colors.transparent, + onTap: () async { + await listViewBooksRecord.reference + .delete(); + ScaffoldMessenger.of(context) + .showSnackBar( + SnackBar( + content: Text( + 'Book deleted', + style: TextStyle( + color: + FlutterFlowTheme.of(context) + .primaryText, + ), + ), + duration: + Duration(milliseconds: 4000), + backgroundColor: + FlutterFlowTheme.of(context) + .secondary, + ), + ); + safeSetState(() => _model + .firestoreRequestCompleter = null); + await _model + .waitForFirestoreRequestCompleted(); + }, + child: Icon( + Icons.delete, + color: FlutterFlowTheme.of(context).error, + size: 44.0, + ), + ), + ], + ), + ); + }, + ); + }, + ), + ), + ].divide(SizedBox(height: 24.0)), + ), + ), + ), + ), + ), + ); + } +} diff --git a/lib/components/activate_account_model.dart b/lib/components/activate_account_model.dart index f5fdf73..466b238 100644 --- a/lib/components/activate_account_model.dart +++ b/lib/components/activate_account_model.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:async'; import 'dart:math'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'activate_account_widget.dart' show ActivateAccountWidget; import 'package:cloud_firestore/cloud_firestore.dart'; diff --git a/lib/components/activate_account_widget.dart b/lib/components/activate_account_widget.dart index 685e2ab..a0e2569 100644 --- a/lib/components/activate_account_widget.dart +++ b/lib/components/activate_account_widget.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:async'; import 'dart:math'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:collection/collection.dart'; diff --git a/lib/components/blocked_account_model.dart b/lib/components/blocked_account_model.dart index 10bf752..ec2e9b2 100644 --- a/lib/components/blocked_account_model.dart +++ b/lib/components/blocked_account_model.dart @@ -2,6 +2,7 @@ import '/auth/firebase_auth/auth_util.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'blocked_account_widget.dart' show BlockedAccountWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/blocked_account_widget.dart b/lib/components/blocked_account_widget.dart index f8dc20d..d93a0e7 100644 --- a/lib/components/blocked_account_widget.dart +++ b/lib/components/blocked_account_widget.dart @@ -2,6 +2,7 @@ import '/auth/firebase_auth/auth_util.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/components/comments/comments_model.dart b/lib/components/comments/comments_model.dart index ab9af79..41afa28 100644 --- a/lib/components/comments/comments_model.dart +++ b/lib/components/comments/comments_model.dart @@ -3,6 +3,7 @@ import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'comments_widget.dart' show CommentsWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/components/comments/comments_widget.dart b/lib/components/comments/comments_widget.dart index 2898ade..06bf77b 100644 --- a/lib/components/comments/comments_widget.dart +++ b/lib/components/comments/comments_widget.dart @@ -3,6 +3,7 @@ import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -120,8 +121,8 @@ class _CommentsWidgetState extends State { width: 60.0, height: 4.0, decoration: BoxDecoration( - color: - FlutterFlowTheme.of(context).alternate, + color: FlutterFlowTheme.of(context) + .secondaryText, borderRadius: BorderRadius.circular(4.0), ), ), diff --git a/lib/components/create_modal/create_modal_model.dart b/lib/components/create_modal/create_modal_model.dart index d3579c5..382a6d1 100644 --- a/lib/components/create_modal/create_modal_model.dart +++ b/lib/components/create_modal/create_modal_model.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'create_modal_widget.dart' show CreateModalWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/create_modal/create_modal_widget.dart b/lib/components/create_modal/create_modal_widget.dart index 5567bb8..e437f6c 100644 --- a/lib/components/create_modal/create_modal_widget.dart +++ b/lib/components/create_modal/create_modal_widget.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; @@ -78,7 +79,7 @@ class _CreateModalWidgetState extends State { width: 60.0, height: 4.0, decoration: BoxDecoration( - color: FlutterFlowTheme.of(context).alternate, + color: FlutterFlowTheme.of(context).secondaryText, borderRadius: BorderRadius.circular(4.0), ), ), diff --git a/lib/components/delete_grade_history/delete_grade_history_model.dart b/lib/components/delete_grade_history/delete_grade_history_model.dart index 95cc693..040e904 100644 --- a/lib/components/delete_grade_history/delete_grade_history_model.dart +++ b/lib/components/delete_grade_history/delete_grade_history_model.dart @@ -1,6 +1,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'delete_grade_history_widget.dart' show DeleteGradeHistoryWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/components/delete_grade_history/delete_grade_history_widget.dart b/lib/components/delete_grade_history/delete_grade_history_widget.dart index 03d9c9a..be0def3 100644 --- a/lib/components/delete_grade_history/delete_grade_history_widget.dart +++ b/lib/components/delete_grade_history/delete_grade_history_widget.dart @@ -1,6 +1,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/delete_post/delete_post_model.dart b/lib/components/delete_post/delete_post_model.dart index 6a20035..4b85e1d 100644 --- a/lib/components/delete_post/delete_post_model.dart +++ b/lib/components/delete_post/delete_post_model.dart @@ -2,6 +2,7 @@ import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'delete_post_widget.dart' show DeletePostWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/delete_post/delete_post_widget.dart b/lib/components/delete_post/delete_post_widget.dart index 541e077..860b774 100644 --- a/lib/components/delete_post/delete_post_widget.dart +++ b/lib/components/delete_post/delete_post_widget.dart @@ -2,6 +2,7 @@ import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; @@ -85,7 +86,7 @@ class _DeletePostWidgetState extends State { width: 60.0, height: 4.0, decoration: BoxDecoration( - color: FlutterFlowTheme.of(context).alternate, + color: FlutterFlowTheme.of(context).secondaryText, borderRadius: BorderRadius.circular(4.0), ), ), diff --git a/lib/components/delete_story/delete_story_model.dart b/lib/components/delete_story/delete_story_model.dart index 833e103..4711d1c 100644 --- a/lib/components/delete_story/delete_story_model.dart +++ b/lib/components/delete_story/delete_story_model.dart @@ -2,6 +2,7 @@ import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'delete_story_widget.dart' show DeleteStoryWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/delete_story/delete_story_widget.dart b/lib/components/delete_story/delete_story_widget.dart index 72efd1c..46b7864 100644 --- a/lib/components/delete_story/delete_story_widget.dart +++ b/lib/components/delete_story/delete_story_widget.dart @@ -2,6 +2,7 @@ import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; @@ -85,7 +86,7 @@ class _DeleteStoryWidgetState extends State { width: 60.0, height: 4.0, decoration: BoxDecoration( - color: FlutterFlowTheme.of(context).alternate, + color: FlutterFlowTheme.of(context).secondaryText, borderRadius: BorderRadius.circular(4.0), ), ), diff --git a/lib/components/download_available/download_available_model.dart b/lib/components/download_available/download_available_model.dart index 78f9052..1d6290e 100644 --- a/lib/components/download_available/download_available_model.dart +++ b/lib/components/download_available/download_available_model.dart @@ -1,6 +1,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'download_available_widget.dart' show DownloadAvailableWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/download_available/download_available_widget.dart b/lib/components/download_available/download_available_widget.dart index e975193..a8a6696 100644 --- a/lib/components/download_available/download_available_widget.dart +++ b/lib/components/download_available/download_available_widget.dart @@ -1,6 +1,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:lottie/lottie.dart'; diff --git a/lib/components/empty_list_1/empty_list1_model.dart b/lib/components/empty_list_1/empty_list1_model.dart index 492d1d1..002a9f8 100644 --- a/lib/components/empty_list_1/empty_list1_model.dart +++ b/lib/components/empty_list_1/empty_list1_model.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'empty_list1_widget.dart' show EmptyList1Widget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/empty_list_1/empty_list1_widget.dart b/lib/components/empty_list_1/empty_list1_widget.dart index bd9dd78..62b1968 100644 --- a/lib/components/empty_list_1/empty_list1_widget.dart +++ b/lib/components/empty_list_1/empty_list1_widget.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/components/empty_list_2/empty_list2_model.dart b/lib/components/empty_list_2/empty_list2_model.dart index 7e37088..ae0e8cd 100644 --- a/lib/components/empty_list_2/empty_list2_model.dart +++ b/lib/components/empty_list_2/empty_list2_model.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'empty_list2_widget.dart' show EmptyList2Widget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/empty_list_2/empty_list2_widget.dart b/lib/components/empty_list_2/empty_list2_widget.dart index 948104a..c7a210f 100644 --- a/lib/components/empty_list_2/empty_list2_widget.dart +++ b/lib/components/empty_list_2/empty_list2_widget.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/components/empty_list_grade/empty_list_grade_model.dart b/lib/components/empty_list_grade/empty_list_grade_model.dart index 6794782..035d331 100644 --- a/lib/components/empty_list_grade/empty_list_grade_model.dart +++ b/lib/components/empty_list_grade/empty_list_grade_model.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'empty_list_grade_widget.dart' show EmptyListGradeWidget; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; diff --git a/lib/components/empty_list_grade/empty_list_grade_widget.dart b/lib/components/empty_list_grade/empty_list_grade_widget.dart index 9238edc..20bc255 100644 --- a/lib/components/empty_list_grade/empty_list_grade_widget.dart +++ b/lib/components/empty_list_grade/empty_list_grade_widget.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/empty_list_stories/empty_list_stories_model.dart b/lib/components/empty_list_stories/empty_list_stories_model.dart index e45c791..a0f7035 100644 --- a/lib/components/empty_list_stories/empty_list_stories_model.dart +++ b/lib/components/empty_list_stories/empty_list_stories_model.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'empty_list_stories_widget.dart' show EmptyListStoriesWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/empty_list_stories/empty_list_stories_widget.dart b/lib/components/empty_list_stories/empty_list_stories_widget.dart index 0947025..ced6b41 100644 --- a/lib/components/empty_list_stories/empty_list_stories_widget.dart +++ b/lib/components/empty_list_stories/empty_list_stories_widget.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/components/home_list_card_model.dart b/lib/components/home_list_card_model.dart index 5237ef5..733081c 100644 --- a/lib/components/home_list_card_model.dart +++ b/lib/components/home_list_card_model.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'home_list_card_widget.dart' show HomeListCardWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/home_list_card_widget.dart b/lib/components/home_list_card_widget.dart index e6bd22e..f409f3f 100644 --- a/lib/components/home_list_card_widget.dart +++ b/lib/components/home_list_card_widget.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/components/post_loading_effect/post_loading_effect_model.dart b/lib/components/post_loading_effect/post_loading_effect_model.dart new file mode 100644 index 0000000..eaf5293 --- /dev/null +++ b/lib/components/post_loading_effect/post_loading_effect_model.dart @@ -0,0 +1,16 @@ +import '/flutter_flow/flutter_flow_theme.dart'; +import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; +import '/custom_code/widgets/index.dart' as custom_widgets; +import 'post_loading_effect_widget.dart' show PostLoadingEffectWidget; +import 'package:flutter/material.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:provider/provider.dart'; + +class PostLoadingEffectModel extends FlutterFlowModel { + @override + void initState(BuildContext context) {} + + @override + void dispose() {} +} diff --git a/lib/components/post_loading_effect/post_loading_effect_widget.dart b/lib/components/post_loading_effect/post_loading_effect_widget.dart new file mode 100644 index 0000000..f58de9a --- /dev/null +++ b/lib/components/post_loading_effect/post_loading_effect_widget.dart @@ -0,0 +1,149 @@ +import '/flutter_flow/flutter_flow_theme.dart'; +import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; +import '/custom_code/widgets/index.dart' as custom_widgets; +import 'package:flutter/material.dart'; +import 'package:google_fonts/google_fonts.dart'; +import 'package:provider/provider.dart'; +import 'post_loading_effect_model.dart'; +export 'post_loading_effect_model.dart'; + +class PostLoadingEffectWidget extends StatefulWidget { + const PostLoadingEffectWidget({super.key}); + + @override + State createState() => + _PostLoadingEffectWidgetState(); +} + +class _PostLoadingEffectWidgetState extends State { + late PostLoadingEffectModel _model; + + @override + void setState(VoidCallback callback) { + super.setState(callback); + _model.onUpdate(); + } + + @override + void initState() { + super.initState(); + _model = createModel(context, () => PostLoadingEffectModel()); + + WidgetsBinding.instance.addPostFrameCallback((_) => safeSetState(() {})); + } + + @override + void dispose() { + _model.maybeDispose(); + + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return Column( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: double.infinity, + height: 60.0, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context).secondaryBackground, + ), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB(12.0, 8.0, 12.0, 8.0), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: 44.0, + height: 44.0, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context).accent1, + shape: BoxShape.circle, + border: Border.all( + color: FlutterFlowTheme.of(context).primary, + width: 2.0, + ), + ), + ), + ], + ), + ), + ), + Container( + width: double.infinity, + height: 270.0, + child: custom_widgets.Skeleton( + width: double.infinity, + height: 270.0, + ), + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(8.0, 4.0, 8.0, 0.0), + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + mainAxisSize: MainAxisSize.max, + children: [ + Padding( + padding: + EdgeInsetsDirectional.fromSTEB(0.0, 0.0, 16.0, 0.0), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Container( + width: 41.0, + height: 41.0, + child: Stack( + children: [ + Align( + alignment: AlignmentDirectional(0.0, 0.25), + child: Icon( + Icons.favorite_border, + color: FlutterFlowTheme.of(context) + .secondaryText, + size: 25.0, + ), + ), + ], + ), + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 4.0, 0.0, 0.0, 0.0), + child: Text( + '0', + style: FlutterFlowTheme.of(context) + .labelMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + ), + ), + ], + ), + ), + Row( + mainAxisSize: MainAxisSize.max, + children: [ + Icon( + Icons.mode_comment_outlined, + color: FlutterFlowTheme.of(context).secondaryText, + size: 24.0, + ), + ], + ), + ], + ), + ], + ), + ), + ], + ); + } +} diff --git a/lib/components/save_gpa_component/save_gpa_component_model.dart b/lib/components/save_gpa_component/save_gpa_component_model.dart index c324e6e..a78bf33 100644 --- a/lib/components/save_gpa_component/save_gpa_component_model.dart +++ b/lib/components/save_gpa_component/save_gpa_component_model.dart @@ -4,6 +4,7 @@ import '/backend/schema/structs/index.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'save_gpa_component_widget.dart' show SaveGpaComponentWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/components/save_gpa_component/save_gpa_component_widget.dart b/lib/components/save_gpa_component/save_gpa_component_widget.dart index 0aea519..b4dbe91 100644 --- a/lib/components/save_gpa_component/save_gpa_component_widget.dart +++ b/lib/components/save_gpa_component/save_gpa_component_widget.dart @@ -4,6 +4,7 @@ import '/backend/schema/structs/index.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/user_list/user_list_model.dart b/lib/components/user_list/user_list_model.dart index 67f65cd..a38f804 100644 --- a/lib/components/user_list/user_list_model.dart +++ b/lib/components/user_list/user_list_model.dart @@ -2,6 +2,7 @@ import '/auth/firebase_auth/auth_util.dart'; import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'user_list_widget.dart' show UserListWidget; import 'package:cached_network_image/cached_network_image.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; diff --git a/lib/components/user_list/user_list_widget.dart b/lib/components/user_list/user_list_widget.dart index d1c2c95..d215260 100644 --- a/lib/components/user_list/user_list_widget.dart +++ b/lib/components/user_list/user_list_widget.dart @@ -2,6 +2,7 @@ import '/auth/firebase_auth/auth_util.dart'; import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/components/web_components/post_details_base/post_details_base_model.dart b/lib/components/web_components/post_details_base/post_details_base_model.dart index 38e0ac7..ce00e1c 100644 --- a/lib/components/web_components/post_details_base/post_details_base_model.dart +++ b/lib/components/web_components/post_details_base/post_details_base_model.dart @@ -11,6 +11,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_video_player.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'post_details_base_widget.dart' show PostDetailsBaseWidget; import 'package:cached_network_image/cached_network_image.dart'; diff --git a/lib/components/web_components/post_details_base/post_details_base_widget.dart b/lib/components/web_components/post_details_base/post_details_base_widget.dart index 48e5734..b171bc5 100644 --- a/lib/components/web_components/post_details_base/post_details_base_widget.dart +++ b/lib/components/web_components/post_details_base/post_details_base_widget.dart @@ -11,6 +11,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_video_player.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'package:cached_network_image/cached_network_image.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; @@ -388,9 +389,6 @@ class _PostDetailsBaseWidgetState extends State valueOrDefault( containerUserPostsRecord.postDescription, '--', - ).maybeHandleOverflow( - maxChars: 200, - replacement: '…', ), style: FlutterFlowTheme.of(context) .bodyLarge diff --git a/lib/components/web_components/post_modal_view/post_modal_view_model.dart b/lib/components/web_components/post_modal_view/post_modal_view_model.dart index 4ef66ed..1a8bb55 100644 --- a/lib/components/web_components/post_modal_view/post_modal_view_model.dart +++ b/lib/components/web_components/post_modal_view/post_modal_view_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_animations.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import 'dart:math'; +import 'dart:ui'; import 'post_modal_view_widget.dart' show PostModalViewWidget; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; diff --git a/lib/components/web_components/post_modal_view/post_modal_view_widget.dart b/lib/components/web_components/post_modal_view/post_modal_view_widget.dart index a1e616f..1e24e43 100644 --- a/lib/components/web_components/post_modal_view/post_modal_view_widget.dart +++ b/lib/components/web_components/post_modal_view/post_modal_view_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_animations.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import 'dart:math'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_animate/flutter_animate.dart'; diff --git a/lib/components/web_components/side_nav/side_nav_model.dart b/lib/components/web_components/side_nav/side_nav_model.dart index 212c2d3..96ce40c 100644 --- a/lib/components/web_components/side_nav/side_nav_model.dart +++ b/lib/components/web_components/side_nav/side_nav_model.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'side_nav_widget.dart' show SideNavWidget; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; diff --git a/lib/components/web_components/side_nav/side_nav_widget.dart b/lib/components/web_components/side_nav/side_nav_widget.dart index f0d71e9..94aab46 100644 --- a/lib/components/web_components/side_nav/side_nav_widget.dart +++ b/lib/components/web_components/side_nav/side_nav_widget.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/components/web_components/stories/stories_model.dart b/lib/components/web_components/stories/stories_model.dart index 73d74c6..7ed04c8 100644 --- a/lib/components/web_components/stories/stories_model.dart +++ b/lib/components/web_components/stories/stories_model.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_video_player.dart'; import 'dart:math'; +import 'dart:ui'; import 'package:smooth_page_indicator/smooth_page_indicator.dart' as smooth_page_indicator; import 'stories_widget.dart' show StoriesWidget; diff --git a/lib/components/web_components/stories/stories_widget.dart b/lib/components/web_components/stories/stories_widget.dart index 3f86782..97dd0c1 100644 --- a/lib/components/web_components/stories/stories_widget.dart +++ b/lib/components/web_components/stories/stories_widget.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_video_player.dart'; import 'dart:math'; +import 'dart:ui'; import 'package:smooth_page_indicator/smooth_page_indicator.dart' as smooth_page_indicator; import 'package:flutter/material.dart'; @@ -128,7 +129,7 @@ class _StoriesWidgetState extends State mainAxisSize: MainAxisSize.max, children: [ Container( - height: MediaQuery.sizeOf(context).height * 0.82, + height: MediaQuery.sizeOf(context).height * 0.9, child: Stack( children: [ if (pageViewUserStoriesRecord.storyPhoto != diff --git a/lib/components/web_components/story_modal_view/story_modal_view_model.dart b/lib/components/web_components/story_modal_view/story_modal_view_model.dart index f5e988e..84a4ce7 100644 --- a/lib/components/web_components/story_modal_view/story_modal_view_model.dart +++ b/lib/components/web_components/story_modal_view/story_modal_view_model.dart @@ -3,6 +3,7 @@ import '/flutter_flow/flutter_flow_animations.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import 'dart:math'; +import 'dart:ui'; import 'story_modal_view_widget.dart' show StoryModalViewWidget; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; diff --git a/lib/components/web_components/story_modal_view/story_modal_view_widget.dart b/lib/components/web_components/story_modal_view/story_modal_view_widget.dart index 407e7d9..6026f90 100644 --- a/lib/components/web_components/story_modal_view/story_modal_view_widget.dart +++ b/lib/components/web_components/story_modal_view/story_modal_view_widget.dart @@ -3,6 +3,7 @@ import '/flutter_flow/flutter_flow_animations.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import 'dart:math'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_animate/flutter_animate.dart'; diff --git a/lib/custom_code/actions/start_n_f_c_writing.dart b/lib/custom_code/actions/start_n_f_c_writing.dart index c774f02..7fd0b62 100644 --- a/lib/custom_code/actions/start_n_f_c_writing.dart +++ b/lib/custom_code/actions/start_n_f_c_writing.dart @@ -51,12 +51,12 @@ Future startNFCWriting( }); } else { // Show a SnackBar if NFC is not available. - ScaffoldMessenger.of(context) - .showSnackBar(SnackBar(content: Text('NFC not available.'))); + // ScaffoldMessenger.of(context) + // .showSnackBar(SnackBar(content: Text('NFC not available.'))); } } catch (e) { // Show a SnackBar for any other errors. - ScaffoldMessenger.of(context) - .showSnackBar(SnackBar(content: Text('Error writing to NFC: $e'))); + // ScaffoldMessenger.of(context) + // .showSnackBar(SnackBar(content: Text('Error writing to NFC: $e'))); } } diff --git a/lib/custom_code/widgets/index.dart b/lib/custom_code/widgets/index.dart new file mode 100644 index 0000000..0067b59 --- /dev/null +++ b/lib/custom_code/widgets/index.dart @@ -0,0 +1 @@ +export 'skeleton.dart' show Skeleton; diff --git a/lib/custom_code/widgets/skeleton.dart b/lib/custom_code/widgets/skeleton.dart new file mode 100644 index 0000000..a70c25c --- /dev/null +++ b/lib/custom_code/widgets/skeleton.dart @@ -0,0 +1,57 @@ +// Automatic FlutterFlow imports +import '/backend/backend.dart'; +import '/backend/schema/structs/index.dart'; +import '/flutter_flow/flutter_flow_theme.dart'; +import '/flutter_flow/flutter_flow_util.dart'; +import 'index.dart'; // Imports other custom widgets +import '/custom_code/actions/index.dart'; // Imports custom actions +import '/flutter_flow/custom_functions.dart'; // Imports custom functions +import 'package:flutter/material.dart'; +// Begin custom widget code +// DO NOT REMOVE OR MODIFY THE CODE ABOVE! + +import 'package:shimmer/shimmer.dart'; + +class Skeleton extends StatefulWidget { + const Skeleton({ + Key? key, + this.width, + this.height, + }) : super(key: key); + + final double? width; + final double? height; + + @override + _SkeletonState createState() => _SkeletonState(); +} + +class _SkeletonState extends State { + @override + Widget build(BuildContext context) { + return Container( + height: widget.height!, + width: widget.width!, + color: const Color(0xFFFBFAF4), + child: Column(mainAxisSize: MainAxisSize.max, children: [ + Expanded( + child: Shimmer.fromColors( + baseColor: Colors.grey[300]!, + highlightColor: Colors.grey[100]!, + enabled: true, + child: Padding( + padding: const EdgeInsets.all(0.0), + child: Container( + decoration: BoxDecoration( + color: const Color(0xFFFBFAF4), + border: Border.all( + color: Colors.grey[300]!, + ), + borderRadius: BorderRadius.all(Radius.circular(0))), + width: widget.width, + height: widget.height!, + ), + ))) + ])); + } +} diff --git a/lib/flutter_flow/custom_functions.dart b/lib/flutter_flow/custom_functions.dart index 1f1d6ff..346dfb0 100644 --- a/lib/flutter_flow/custom_functions.dart +++ b/lib/flutter_flow/custom_functions.dart @@ -178,3 +178,14 @@ bool checkAAASTUEmail(String str) { final emailRegex = RegExp(r"^[\w\.-]+@aastustudent\.edu\.et$"); return emailRegex.hasMatch(str); } + +String trimBookTitle(String title) { + if (title.length <= 13) { + return title; // No need to trim if the title is already within the limit + } + return title.substring(0, 13) + "..."; +} + +DateTime expiredDateMaker(DateTime postedDate) { + return postedDate.add(Duration(hours: 24)); +} diff --git a/lib/flutter_flow/flutter_flow_button_tabbar.dart b/lib/flutter_flow/flutter_flow_button_tabbar.dart index c0151fe..b18f2db 100644 --- a/lib/flutter_flow/flutter_flow_button_tabbar.dart +++ b/lib/flutter_flow/flutter_flow_button_tabbar.dart @@ -623,7 +623,7 @@ class _FlutterFlowButtonTabBarState extends State } Widget _buildStyledTab(Widget child, int index) { - final TabBarTheme tabBarTheme = TabBarTheme.of(context); + final tabBarTheme = TabBarTheme.of(context); final double animationValue; if (index == _currentIndex) { diff --git a/lib/flutter_flow/flutter_flow_choice_chips.dart b/lib/flutter_flow/flutter_flow_choice_chips.dart index e3a592e..948972d 100644 --- a/lib/flutter_flow/flutter_flow_choice_chips.dart +++ b/lib/flutter_flow/flutter_flow_choice_chips.dart @@ -126,6 +126,7 @@ class _FlutterFlowChoiceChipsState extends State { label: Text( option.label, style: style.textStyle, + overflow: TextOverflow.ellipsis, ), labelPadding: style.labelPadding, avatar: option.iconData != null diff --git a/lib/flutter_flow/flutter_flow_theme.dart b/lib/flutter_flow/flutter_flow_theme.dart index dac6a05..847bdfb 100644 --- a/lib/flutter_flow/flutter_flow_theme.dart +++ b/lib/flutter_flow/flutter_flow_theme.dart @@ -58,6 +58,10 @@ abstract class FlutterFlowTheme { late Color whiteText; late Color chipBlack; late Color blueBlackText; + late Color inputBackground; + late Color chipcolor; + late Color lightgreen; + late Color lightRed; @Deprecated('Use displaySmallFamily instead') String get title1Family => displaySmallFamily; @@ -151,6 +155,10 @@ class LightModeTheme extends FlutterFlowTheme { late Color whiteText = Color(0xFFFFFFFF); late Color chipBlack = Color(0xFF252525); late Color blueBlackText = Color(0xFF283439); + late Color inputBackground = Color(0xFFF8F8F8); + late Color chipcolor = Color(0xFFEDEAFD); + late Color lightgreen = Color(0xFFE4FCFF); + late Color lightRed = Color(0xFFFFECF2); } abstract class Typography { @@ -327,6 +335,10 @@ class DarkModeTheme extends FlutterFlowTheme { late Color whiteText = Color(0xFFFFFFFF); late Color chipBlack = Color(0xFF252525); late Color blueBlackText = Color(0xFFFFFFFF); + late Color inputBackground = Color(0xFF313442); + late Color chipcolor = Color(0xFF313442); + late Color lightgreen = Color(0xFF2F3C3E); + late Color lightRed = Color(0xFF3E2C32); } extension TextStyleHelper on TextStyle { diff --git a/lib/flutter_flow/flutter_flow_util.dart b/lib/flutter_flow/flutter_flow_util.dart index 8902335..9aeb0ce 100644 --- a/lib/flutter_flow/flutter_flow_util.dart +++ b/lib/flutter_flow/flutter_flow_util.dart @@ -33,7 +33,7 @@ export 'package:cloud_firestore/cloud_firestore.dart' export 'package:page_transition/page_transition.dart'; export 'nav/nav.dart'; -final RouteObserver routeObserver = RouteObserver(); +final RouteObserver routeObserver = RouteObserver(); T valueOrDefault(T? value, T defaultValue) => (value is String && value.isEmpty) || value == null ? defaultValue : value; diff --git a/lib/flutter_flow/nav/nav.dart b/lib/flutter_flow/nav/nav.dart index b53fbcf..b410ce3 100644 --- a/lib/flutter_flow/nav/nav.dart +++ b/lib/flutter_flow/nav/nav.dart @@ -22,6 +22,8 @@ export 'serialization_util.dart'; const kTransitionInfoKey = '__transition_info__'; +GlobalKey appNavigatorKey = GlobalKey(); + class AppStateNotifier extends ChangeNotifier { AppStateNotifier._(); @@ -80,6 +82,7 @@ GoRouter createRouter(AppStateNotifier appStateNotifier, [Widget? entryPage]) => initialLocation: '/', debugLogDiagnostics: true, refreshListenable: appStateNotifier, + navigatorKey: appNavigatorKey, errorBuilder: (context, state) => appStateNotifier.loggedIn ? entryPage ?? NavBarPage() : LoginWidget(), routes: [ @@ -376,6 +379,11 @@ GoRouter createRouter(AppStateNotifier appStateNotifier, [Widget? entryPage]) => builder: (context, params) => params.isEmpty ? NavBarPage(initialPage: 'BookStore') : BookStoreWidget(), + ), + FFRoute( + name: 'BookUpload', + path: '/bookUpload', + builder: (context, params) => BookUploadWidget(), ) ].map((r) => r.toRoute(appStateNotifier)).toList(), observers: [routeObserver], diff --git a/lib/index.dart b/lib/index.dart index 4f6bffd..5bd7b78 100644 --- a/lib/index.dart +++ b/lib/index.dart @@ -63,3 +63,4 @@ export '/privacy/privacy_widget.dart' show PrivacyWidget; export '/pages/features/students_portal_web/students_portal_web_widget.dart' show StudentsPortalWebWidget; export '/pages/book_store/book_store_widget.dart' show BookStoreWidget; +export '/book_upload/book_upload_widget.dart' show BookUploadWidget; diff --git a/lib/pages/authentication/about_us/about_us_model.dart b/lib/pages/authentication/about_us/about_us_model.dart index e0cc971..a5f33f7 100644 --- a/lib/pages/authentication/about_us/about_us_model.dart +++ b/lib/pages/authentication/about_us/about_us_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import 'about_us_widget.dart' show AboutUsWidget; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; diff --git a/lib/pages/authentication/about_us/about_us_widget.dart b/lib/pages/authentication/about_us/about_us_widget.dart index 8ab5cee..e49d0b1 100644 --- a/lib/pages/authentication/about_us/about_us_widget.dart +++ b/lib/pages/authentication/about_us/about_us_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_animate/flutter_animate.dart'; @@ -785,8 +786,8 @@ class _AboutUsWidgetState extends State mainAxisSize: MainAxisSize.max, children: [ Container( - width: 64.0, - height: 64.0, + width: 55.0, + height: 55.0, decoration: BoxDecoration( color: FlutterFlowTheme.of(context).accent1, @@ -849,7 +850,7 @@ class _AboutUsWidgetState extends State fontFamily: 'Lexend Deca', color: FlutterFlowTheme.of(context) .secondaryText, - fontSize: 12.0, + fontSize: 10.0, letterSpacing: 0.0, fontWeight: FontWeight.normal, ), diff --git a/lib/pages/authentication/change_password/change_password_model.dart b/lib/pages/authentication/change_password/change_password_model.dart index f9d3db7..9986ffe 100644 --- a/lib/pages/authentication/change_password/change_password_model.dart +++ b/lib/pages/authentication/change_password/change_password_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_icon_button.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'change_password_widget.dart' show ChangePasswordWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/authentication/change_password/change_password_widget.dart b/lib/pages/authentication/change_password/change_password_widget.dart index 6630fb3..c4cb90d 100644 --- a/lib/pages/authentication/change_password/change_password_widget.dart +++ b/lib/pages/authentication/change_password/change_password_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_icon_button.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/authentication/create_your_profile/create_your_profile_model.dart b/lib/pages/authentication/create_your_profile/create_your_profile_model.dart index 8dccad6..d6577e9 100644 --- a/lib/pages/authentication/create_your_profile/create_your_profile_model.dart +++ b/lib/pages/authentication/create_your_profile/create_your_profile_model.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/form_field_controller.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import '/flutter_flow/custom_functions.dart' as functions; import 'create_your_profile_widget.dart' show CreateYourProfileWidget; diff --git a/lib/pages/authentication/create_your_profile/create_your_profile_widget.dart b/lib/pages/authentication/create_your_profile/create_your_profile_widget.dart index 7070bc3..92304c4 100644 --- a/lib/pages/authentication/create_your_profile/create_your_profile_widget.dart +++ b/lib/pages/authentication/create_your_profile/create_your_profile_widget.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/form_field_controller.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import '/flutter_flow/custom_functions.dart' as functions; import 'package:cloud_firestore/cloud_firestore.dart'; @@ -349,7 +350,8 @@ class _CreateYourProfileWidgetState extends State { borderRadius: BorderRadius.circular(8.0), ), filled: true, - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, contentPadding: EdgeInsetsDirectional.fromSTEB( 20.0, 24.0, 20.0, 24.0), @@ -423,7 +425,8 @@ class _CreateYourProfileWidgetState extends State { borderRadius: BorderRadius.circular(8.0), ), filled: true, - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, contentPadding: EdgeInsetsDirectional.fromSTEB( 20.0, 24.0, 20.0, 24.0), @@ -505,7 +508,8 @@ class _CreateYourProfileWidgetState extends State { BorderRadius.circular(8.0), ), filled: true, - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, contentPadding: EdgeInsetsDirectional.fromSTEB( 20.0, 24.0, 20.0, 24.0), @@ -576,7 +580,8 @@ class _CreateYourProfileWidgetState extends State { .secondaryText, size: 24.0, ), - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, elevation: 2.0, borderColor: Colors.transparent, borderWidth: 0.0, @@ -632,7 +637,8 @@ class _CreateYourProfileWidgetState extends State { .secondaryText, size: 24.0, ), - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, elevation: 2.0, borderColor: Colors.transparent, borderWidth: 0.0, @@ -657,7 +663,8 @@ class _CreateYourProfileWidgetState extends State { Expanded( child: Container( decoration: BoxDecoration( - color: Color(0xFFF8F8F8), + color: FlutterFlowTheme.of(context) + .inputBackground, borderRadius: BorderRadius.circular(6.0), ), child: Material( diff --git a/lib/pages/authentication/edit_settings/edit_settings_model.dart b/lib/pages/authentication/edit_settings/edit_settings_model.dart index ff1bfb8..9fbd5a2 100644 --- a/lib/pages/authentication/edit_settings/edit_settings_model.dart +++ b/lib/pages/authentication/edit_settings/edit_settings_model.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/pages/features/components/delete_account/delete_account_widget.dart'; import 'dart:math'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'edit_settings_widget.dart' show EditSettingsWidget; import 'package:cloud_firestore/cloud_firestore.dart'; diff --git a/lib/pages/authentication/edit_settings/edit_settings_widget.dart b/lib/pages/authentication/edit_settings/edit_settings_widget.dart index d3f9e7a..a55f5bc 100644 --- a/lib/pages/authentication/edit_settings/edit_settings_widget.dart +++ b/lib/pages/authentication/edit_settings/edit_settings_widget.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/pages/features/components/delete_account/delete_account_widget.dart'; import 'dart:math'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/gestures.dart'; diff --git a/lib/pages/authentication/forgot_password/forgot_password_model.dart b/lib/pages/authentication/forgot_password/forgot_password_model.dart index c0d3564..4c2c9b2 100644 --- a/lib/pages/authentication/forgot_password/forgot_password_model.dart +++ b/lib/pages/authentication/forgot_password/forgot_password_model.dart @@ -3,6 +3,7 @@ import '/flutter_flow/flutter_flow_icon_button.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'forgot_password_widget.dart' show ForgotPasswordWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/authentication/forgot_password/forgot_password_widget.dart b/lib/pages/authentication/forgot_password/forgot_password_widget.dart index 12c3d3f..bd09014 100644 --- a/lib/pages/authentication/forgot_password/forgot_password_widget.dart +++ b/lib/pages/authentication/forgot_password/forgot_password_widget.dart @@ -3,6 +3,7 @@ import '/flutter_flow/flutter_flow_icon_button.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/pages/authentication/login/login_model.dart b/lib/pages/authentication/login/login_model.dart index 2ac3cc7..6f208c1 100644 --- a/lib/pages/authentication/login/login_model.dart +++ b/lib/pages/authentication/login/login_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'login_widget.dart' show LoginWidget; import 'package:flutter/material.dart'; diff --git a/lib/pages/authentication/login/login_widget.dart b/lib/pages/authentication/login/login_widget.dart index b5ac2d7..ef3e057 100644 --- a/lib/pages/authentication/login/login_widget.dart +++ b/lib/pages/authentication/login/login_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; @@ -378,7 +379,8 @@ class _LoginWidgetState extends State borderRadius: BorderRadius.circular(8.0), ), filled: true, - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, contentPadding: EdgeInsetsDirectional.fromSTEB( 20.0, 4.0, 20.0, 4.0), @@ -452,7 +454,8 @@ class _LoginWidgetState extends State borderRadius: BorderRadius.circular(8.0), ), filled: true, - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, contentPadding: EdgeInsetsDirectional.fromSTEB( 20.0, 4.0, 20.0, 4.0), diff --git a/lib/pages/authentication/signup/signup_model.dart b/lib/pages/authentication/signup/signup_model.dart index 8d6e3c1..5b4ccd3 100644 --- a/lib/pages/authentication/signup/signup_model.dart +++ b/lib/pages/authentication/signup/signup_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import 'signup_widget.dart' show SignupWidget; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; diff --git a/lib/pages/authentication/signup/signup_widget.dart b/lib/pages/authentication/signup/signup_widget.dart index 1fa66d2..b0d65f4 100644 --- a/lib/pages/authentication/signup/signup_widget.dart +++ b/lib/pages/authentication/signup/signup_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_animate/flutter_animate.dart'; @@ -373,7 +374,8 @@ class _SignupWidgetState extends State borderRadius: BorderRadius.circular(8.0), ), filled: true, - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, contentPadding: EdgeInsetsDirectional.fromSTEB( 20.0, 4.0, 20.0, 4.0), @@ -447,7 +449,8 @@ class _SignupWidgetState extends State borderRadius: BorderRadius.circular(8.0), ), filled: true, - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, contentPadding: EdgeInsetsDirectional.fromSTEB( 20.0, 4.0, 20.0, 4.0), diff --git a/lib/pages/book_store/book_store_model.dart b/lib/pages/book_store/book_store_model.dart index 8dde443..d3ef6f3 100644 --- a/lib/pages/book_store/book_store_model.dart +++ b/lib/pages/book_store/book_store_model.dart @@ -1,13 +1,19 @@ +import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_animations.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; +import '/flutter_flow/custom_functions.dart' as functions; import 'book_store_widget.dart' show BookStoreWidget; +import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_animate/flutter_animate.dart'; +import 'package:flutter_blurhash/flutter_blurhash.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:octo_image/octo_image.dart'; import 'package:provider/provider.dart'; class BookStoreModel extends FlutterFlowModel { diff --git a/lib/pages/book_store/book_store_widget.dart b/lib/pages/book_store/book_store_widget.dart index 5cdba2f..830a261 100644 --- a/lib/pages/book_store/book_store_widget.dart +++ b/lib/pages/book_store/book_store_widget.dart @@ -1,12 +1,18 @@ +import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_animations.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; +import '/flutter_flow/custom_functions.dart' as functions; +import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_animate/flutter_animate.dart'; +import 'package:flutter_blurhash/flutter_blurhash.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:octo_image/octo_image.dart'; import 'package:provider/provider.dart'; import 'book_store_model.dart'; export 'book_store_model.dart'; @@ -70,44 +76,6 @@ class _BookStoreWidgetState extends State ), ], ), - 'containerOnPageLoadAnimation2': AnimationInfo( - trigger: AnimationTrigger.onPageLoad, - effectsBuilder: () => [ - FadeEffect( - curve: Curves.easeInOut, - delay: 0.0.ms, - duration: 600.0.ms, - begin: 0.0, - end: 1.0, - ), - MoveEffect( - curve: Curves.easeInOut, - delay: 0.0.ms, - duration: 600.0.ms, - begin: Offset(90.0, 0.0), - end: Offset(0.0, 0.0), - ), - ], - ), - 'containerOnPageLoadAnimation3': AnimationInfo( - trigger: AnimationTrigger.onPageLoad, - effectsBuilder: () => [ - FadeEffect( - curve: Curves.easeInOut, - delay: 0.0.ms, - duration: 600.0.ms, - begin: 0.0, - end: 1.0, - ), - MoveEffect( - curve: Curves.easeInOut, - delay: 0.0.ms, - duration: 600.0.ms, - begin: Offset(90.0, 0.0), - end: Offset(0.0, 0.0), - ), - ], - ), 'textOnPageLoadAnimation2': AnimationInfo( trigger: AnimationTrigger.onPageLoad, effectsBuilder: () => [ @@ -146,7 +114,7 @@ class _BookStoreWidgetState extends State ), ], ), - 'containerOnPageLoadAnimation4': AnimationInfo( + 'containerOnPageLoadAnimation2': AnimationInfo( trigger: AnimationTrigger.onPageLoad, effectsBuilder: () => [ FadeEffect( @@ -165,44 +133,6 @@ class _BookStoreWidgetState extends State ), ], ), - 'containerOnPageLoadAnimation5': AnimationInfo( - trigger: AnimationTrigger.onPageLoad, - effectsBuilder: () => [ - FadeEffect( - curve: Curves.easeInOut, - delay: 0.0.ms, - duration: 600.0.ms, - begin: 0.0, - end: 1.0, - ), - MoveEffect( - curve: Curves.easeInOut, - delay: 0.0.ms, - duration: 600.0.ms, - begin: Offset(90.0, 0.0), - end: Offset(0.0, 0.0), - ), - ], - ), - 'containerOnPageLoadAnimation6': AnimationInfo( - trigger: AnimationTrigger.onPageLoad, - effectsBuilder: () => [ - FadeEffect( - curve: Curves.easeInOut, - delay: 0.0.ms, - duration: 600.0.ms, - begin: 0.0, - end: 1.0, - ), - MoveEffect( - curve: Curves.easeInOut, - delay: 0.0.ms, - duration: 600.0.ms, - begin: Offset(90.0, 0.0), - end: Offset(0.0, 0.0), - ), - ], - ), }); setupAnimations( animationsMap.values.where((anim) => @@ -224,7 +154,10 @@ class _BookStoreWidgetState extends State @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, @@ -280,353 +213,365 @@ class _BookStoreWidgetState extends State child: Padding( padding: EdgeInsetsDirectional.fromSTEB(0.0, 4.0, 0.0, 5.0), - child: ListView( - padding: EdgeInsets.zero, - primary: false, - shrinkWrap: true, - scrollDirection: Axis.horizontal, - children: [ - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 16.0, 8.0, 0.0, 8.0), - child: InkWell( - splashColor: Colors.transparent, - focusColor: Colors.transparent, - hoverColor: Colors.transparent, - highlightColor: Colors.transparent, - onTap: () async { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text( - 'Book Preview and download not available in this pre-test application.', - style: TextStyle( - color: FlutterFlowTheme.of(context) - .primaryText, - ), - ), - duration: Duration(milliseconds: 4000), - backgroundColor: - FlutterFlowTheme.of(context).secondary, + child: FutureBuilder>( + future: queryBooksRecordOnce( + queryBuilder: (booksRecord) => booksRecord + .where( + 'is_recently_added', + isEqualTo: true, + ) + .orderBy('createdAt', descending: true), + limit: 10, + ), + builder: (context, snapshot) { + // Customize what your widget looks like when it's loading. + if (!snapshot.hasData) { + return Center( + child: SizedBox( + width: 50.0, + height: 50.0, + child: CircularProgressIndicator( + valueColor: AlwaysStoppedAnimation( + FlutterFlowTheme.of(context).primary, ), - ); - }, - child: Container( - width: 200.0, - height: 100.0, - decoration: BoxDecoration( - color: FlutterFlowTheme.of(context) - .secondaryBackground, - boxShadow: [ - BoxShadow( - blurRadius: 4.0, - color: Color(0x430F1113), - offset: Offset( - 0.0, - 1.0, - ), - ) - ], - borderRadius: BorderRadius.circular(12.0), ), - child: Padding( - padding: EdgeInsets.all(8.0), - child: Column( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Hero( - tag: 'locationImage', - transitionOnUserGestures: true, - child: ClipRRect( - borderRadius: - BorderRadius.circular(8.0), - child: Image.asset( - 'assets/images/photo_2022-06-25_22-45-23.jpg', - width: double.infinity, - height: 220.0, - fit: BoxFit.cover, + ), + ); + } + List listViewBooksRecordList = + snapshot.data!; + + return ListView.builder( + padding: EdgeInsets.zero, + primary: false, + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: listViewBooksRecordList.length, + itemBuilder: (context, listViewIndex) { + final listViewBooksRecord = + listViewBooksRecordList[listViewIndex]; + return Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 16.0, 8.0, 0.0, 8.0), + child: InkWell( + splashColor: Colors.transparent, + focusColor: Colors.transparent, + hoverColor: Colors.transparent, + highlightColor: Colors.transparent, + onTap: () async { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text( + 'Book Preview and download not available in this pre-test application.', + style: TextStyle( + color: FlutterFlowTheme.of(context) + .primaryText, ), ), + duration: Duration(milliseconds: 4000), + backgroundColor: + FlutterFlowTheme.of(context) + .secondary, ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 16.0, 0.0, 0.0), - child: Text( - 'Sheldon', - style: FlutterFlowTheme.of(context) - .headlineSmall - .override( - fontFamily: 'Outfit', - letterSpacing: 0.0, - ), - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 4.0, 0.0, 0.0), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Icon( - Icons.star_rounded, - color: - FlutterFlowTheme.of(context) - .primary, - size: 24.0, - ), - Text( - '4.9 Stars', - style: - FlutterFlowTheme.of(context) - .bodyMedium - .override( - fontFamily: 'Figtree', - letterSpacing: 0.0, - ), - ), - ], - ), - ), - Row( + ); + }, + child: Container( + width: 200.0, + height: 100.0, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context) + .secondaryBackground, + boxShadow: [ + BoxShadow( + blurRadius: 4.0, + color: Color(0x430F1113), + offset: Offset( + 0.0, + 1.0, + ), + ) + ], + borderRadius: BorderRadius.circular(12.0), + ), + child: Padding( + padding: EdgeInsets.all(8.0), + child: Column( mainAxisSize: MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.start, children: [ + Hero( + tag: listViewBooksRecord.imageLink, + transitionOnUserGestures: true, + child: ClipRRect( + borderRadius: + BorderRadius.circular(8.0), + child: OctoImage( + placeholderBuilder: (_) => + SizedBox.expand( + child: Image( + image: BlurHashImage( + listViewBooksRecord + .photoBlurHash), + fit: BoxFit.cover, + ), + ), + image: NetworkImage( + listViewBooksRecord.imageLink, + ), + width: double.infinity, + height: 220.0, + fit: BoxFit.cover, + ), + ), + ), Padding( padding: EdgeInsetsDirectional.fromSTEB( - 4.0, 4.0, 0.0, 0.0), + 0.0, 16.0, 0.0, 0.0), child: Text( - 'View Now', - style: - FlutterFlowTheme.of(context) - .labelMedium - .override( - fontFamily: 'Figtree', - letterSpacing: 0.0, - ), - ), - ), - Icon( - Icons.navigate_next, - color: Colors.black, - size: 24.0, - ), - ], - ), - ], - ), - ), - ), - ).animateOnPageLoad(animationsMap[ - 'containerOnPageLoadAnimation1']!), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 8.0, 8.0, 0.0, 8.0), - child: InkWell( - splashColor: Colors.transparent, - focusColor: Colors.transparent, - hoverColor: Colors.transparent, - highlightColor: Colors.transparent, - onTap: () async { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text( - 'Book Preview and download not available in this pre-test application.', - style: TextStyle( - color: FlutterFlowTheme.of(context) - .primaryText, - ), - ), - duration: Duration(milliseconds: 4000), - backgroundColor: - FlutterFlowTheme.of(context).secondary, - ), - ); - }, - child: Container( - width: 200.0, - height: 100.0, - decoration: BoxDecoration( - color: FlutterFlowTheme.of(context) - .secondaryBackground, - boxShadow: [ - BoxShadow( - blurRadius: 4.0, - color: Color(0x430F1113), - offset: Offset( - 0.0, - 1.0, - ), - ) - ], - borderRadius: BorderRadius.circular(12.0), - ), - child: Padding( - padding: EdgeInsets.all(8.0), - child: Column( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - ClipRRect( - borderRadius: - BorderRadius.circular(8.0), - child: Image.asset( - 'assets/images/photo_2024-06-28_22-18-53.jpg', - width: double.infinity, - height: 220.0, - fit: BoxFit.cover, - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 16.0, 0.0, 0.0), - child: Text( - 'Spencer Johnson', - style: FlutterFlowTheme.of(context) - .headlineSmall - .override( - fontFamily: 'Outfit', - letterSpacing: 0.0, + valueOrDefault( + functions.trimBookTitle( + valueOrDefault( + listViewBooksRecord.title, + 'No Title', + )), + 'No Title', ), - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 4.0, 0.0, 0.0), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Icon( - Icons.star_rounded, - color: - FlutterFlowTheme.of(context) - .primary, - size: 24.0, - ), - Text( - '4.7 Stars', style: FlutterFlowTheme.of(context) - .bodyMedium + .headlineSmall .override( - fontFamily: 'Figtree', + fontFamily: 'Outfit', letterSpacing: 0.0, ), ), - ], - ), - ), - Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ + ), Padding( padding: EdgeInsetsDirectional.fromSTEB( - 4.0, 4.0, 0.0, 0.0), - child: Text( - 'View Now', - style: - FlutterFlowTheme.of(context) + 0.0, 4.0, 0.0, 0.0), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Icon( + Icons.star_rounded, + color: FlutterFlowTheme.of( + context) + .primary, + size: 24.0, + ), + RichText( + textScaler: + MediaQuery.of(context) + .textScaler, + text: TextSpan( + children: [ + TextSpan( + text: valueOrDefault< + String>( + listViewBooksRecord + .rating + .toString(), + '5.0', + ), + style: + FlutterFlowTheme.of( + context) + .bodyMedium + .override( + fontFamily: + 'Figtree', + letterSpacing: + 0.0, + ), + ), + TextSpan( + text: 'Stars', + style: TextStyle(), + ) + ], + style: FlutterFlowTheme.of( + context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + ), + ), + ], + ), + ), + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Padding( + padding: EdgeInsetsDirectional + .fromSTEB( + 4.0, 4.0, 0.0, 0.0), + child: Text( + 'View Now', + style: FlutterFlowTheme.of( + context) .labelMedium .override( fontFamily: 'Figtree', letterSpacing: 0.0, ), - ), - ), - Padding( - padding: - EdgeInsetsDirectional.fromSTEB( - 0.0, 4.0, 0.0, 0.0), - child: Icon( - Icons - .keyboard_arrow_right_rounded, - color: - FlutterFlowTheme.of(context) - .secondaryText, - size: 24.0, - ), + ), + ), + Icon( + Icons.navigate_next, + color: Colors.black, + size: 24.0, + ), + ], ), ], ), - ], + ), ), - ), - ), - ).animateOnPageLoad(animationsMap[ - 'containerOnPageLoadAnimation2']!), + ).animateOnPageLoad(animationsMap[ + 'containerOnPageLoadAnimation1']!), + ); + }, + ); + }, + ), + ), + ), + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(16.0, 0.0, 0.0, 12.0), + child: Text( + 'Featured', + style: FlutterFlowTheme.of(context).labelLarge.override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + ).animateOnPageLoad( + animationsMap['textOnPageLoadAnimation2']!), + ), + StreamBuilder>( + stream: queryBooksRecord( + queryBuilder: (booksRecord) => booksRecord + .where( + 'is_featured', + isEqualTo: true, + ) + .orderBy('createdAt'), + limit: 3, + ), + builder: (context, snapshot) { + // Customize what your widget looks like when it's loading. + if (!snapshot.hasData) { + return Center( + child: SizedBox( + width: 50.0, + height: 50.0, + child: CircularProgressIndicator( + valueColor: AlwaysStoppedAnimation( + FlutterFlowTheme.of(context).primary, + ), ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 8.0, 8.0, 16.0, 8.0), + ), + ); + } + List columnBooksRecordList = snapshot.data!; + + return Column( + mainAxisSize: MainAxisSize.max, + children: List.generate(columnBooksRecordList.length, + (columnIndex) { + final columnBooksRecord = + columnBooksRecordList[columnIndex]; + return Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 16.0, 0.0, 16.0, 12.0), + child: InkWell( + splashColor: Colors.transparent, + focusColor: Colors.transparent, + hoverColor: Colors.transparent, + highlightColor: Colors.transparent, + onTap: () async { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text( + 'Book Preview and download not available in this pre-test application.', + style: TextStyle( + color: FlutterFlowTheme.of(context) + .primaryText, + ), + ), + duration: Duration(milliseconds: 4000), + backgroundColor: + FlutterFlowTheme.of(context).secondary, + ), + ); + }, child: Container( - width: 200.0, - height: 100.0, + width: double.infinity, decoration: BoxDecoration( color: FlutterFlowTheme.of(context) .secondaryBackground, boxShadow: [ BoxShadow( - blurRadius: 4.0, - color: Color(0x430F1113), + blurRadius: 7.0, + color: Color(0x2F1D2429), offset: Offset( 0.0, - 1.0, + 3.0, ), ) ], - borderRadius: BorderRadius.circular(12.0), + borderRadius: BorderRadius.circular(8.0), ), child: Padding( - padding: EdgeInsets.all(8.0), + padding: EdgeInsets.all(12.0), child: Column( mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.start, children: [ ClipRRect( borderRadius: BorderRadius.circular(8.0), - child: Image.asset( - 'assets/images/81ANaVZk5LL._SL1500_.jpg', + child: OctoImage( + placeholderBuilder: (_) => + SizedBox.expand( + child: Image( + image: BlurHashImage( + columnBooksRecord + .photoBlurHash), + fit: BoxFit.cover, + ), + ), + image: NetworkImage( + columnBooksRecord.imageLink, + ), width: double.infinity, - height: 220.0, + height: 160.0, fit: BoxFit.cover, + errorBuilder: + (context, error, stackTrace) => + Image.asset( + 'assets/images/error_image.png', + width: double.infinity, + height: 160.0, + fit: BoxFit.cover, + ), ), ), Padding( padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 16.0, 0.0, 0.0), - child: Text( - 'James Clear', - style: FlutterFlowTheme.of(context) - .headlineSmall - .override( - fontFamily: 'Outfit', - letterSpacing: 0.0, - ), - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 4.0, 0.0, 0.0), + 0.0, 8.0, 0.0, 8.0), child: Row( mainAxisSize: MainAxisSize.max, children: [ - Icon( - Icons.star_rounded, - color: FlutterFlowTheme.of(context) - .primary, - size: 24.0, - ), Text( - '4.5 Stars', + columnBooksRecord.title, style: FlutterFlowTheme.of(context) - .bodyMedium + .bodyLarge .override( fontFamily: 'Figtree', letterSpacing: 0.0, @@ -637,15 +582,10 @@ class _BookStoreWidgetState extends State ), Row( mainAxisSize: MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.spaceBetween, children: [ - Padding( - padding: - EdgeInsetsDirectional.fromSTEB( - 4.0, 4.0, 0.0, 0.0), + Expanded( child: Text( - 'View Now', + columnBooksRecord.shortDescription, style: FlutterFlowTheme.of(context) .labelMedium .override( @@ -654,142 +594,17 @@ class _BookStoreWidgetState extends State ), ), ), - Padding( - padding: - EdgeInsetsDirectional.fromSTEB( - 0.0, 4.0, 0.0, 0.0), - child: Icon( - Icons.keyboard_arrow_right_rounded, - color: FlutterFlowTheme.of(context) - .secondaryText, - size: 24.0, - ), - ), ], ), ], ), ), - ).animateOnPageLoad(animationsMap[ - 'containerOnPageLoadAnimation3']!), - ), - ], - ), - ), - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB(16.0, 0.0, 0.0, 12.0), - child: Text( - 'Featured', - style: FlutterFlowTheme.of(context).labelLarge.override( - fontFamily: 'Figtree', - letterSpacing: 0.0, - ), - ).animateOnPageLoad( - animationsMap['textOnPageLoadAnimation2']!), - ), - ListView( - padding: EdgeInsets.zero, - shrinkWrap: true, - scrollDirection: Axis.vertical, - children: [ - Padding( - padding: - EdgeInsetsDirectional.fromSTEB(16.0, 0.0, 16.0, 12.0), - child: InkWell( - splashColor: Colors.transparent, - focusColor: Colors.transparent, - hoverColor: Colors.transparent, - highlightColor: Colors.transparent, - onTap: () async { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text( - 'Book Preview and download not available in this pre-test application.', - style: TextStyle( - color: - FlutterFlowTheme.of(context).primaryText, - ), - ), - duration: Duration(milliseconds: 4000), - backgroundColor: - FlutterFlowTheme.of(context).secondary, - ), - ); - }, - child: Container( - width: double.infinity, - decoration: BoxDecoration( - color: FlutterFlowTheme.of(context) - .secondaryBackground, - boxShadow: [ - BoxShadow( - blurRadius: 7.0, - color: Color(0x2F1D2429), - offset: Offset( - 0.0, - 3.0, - ), - ) - ], - borderRadius: BorderRadius.circular(8.0), - ), - child: Padding( - padding: EdgeInsets.all(12.0), - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - ClipRRect( - borderRadius: BorderRadius.circular(8.0), - child: Image.asset( - 'assets/images/learning-how-to-learn-barbara-oakley.webp', - width: double.infinity, - height: 160.0, - fit: BoxFit.cover, - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 8.0, 0.0, 8.0), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Text( - 'Learning how to learn', - style: FlutterFlowTheme.of(context) - .bodyLarge - .override( - fontFamily: 'Figtree', - letterSpacing: 0.0, - ), - ), - ], - ), - ), - Row( - mainAxisSize: MainAxisSize.max, - children: [ - Expanded( - child: Text( - 'In the book, Barbara explains the techniques you need to master in order to learn better, and she does it in a didactical manner, even making you practice with her own book through...', - style: FlutterFlowTheme.of(context) - .labelMedium - .override( - fontFamily: 'Figtree', - letterSpacing: 0.0, - ), - ), - ), - ], - ), - ], ), ), - ), - ), - ), - ], + ); + }), + ); + }, ), Padding( padding: EdgeInsetsDirectional.fromSTEB(16.0, 12.0, 0.0, 0.0), @@ -813,371 +628,201 @@ class _BookStoreWidgetState extends State child: Padding( padding: EdgeInsetsDirectional.fromSTEB(0.0, 4.0, 0.0, 5.0), - child: ListView( - padding: EdgeInsets.zero, - primary: false, - shrinkWrap: true, - scrollDirection: Axis.horizontal, - children: [ - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 16.0, 8.0, 0.0, 8.0), - child: InkWell( - splashColor: Colors.transparent, - focusColor: Colors.transparent, - hoverColor: Colors.transparent, - highlightColor: Colors.transparent, - onTap: () async { - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text( - 'Book Preview and download not available in this pre-test application.', - style: TextStyle( - color: FlutterFlowTheme.of(context) - .primaryText, - ), - ), - duration: Duration(milliseconds: 4000), - backgroundColor: - FlutterFlowTheme.of(context).secondary, + child: FutureBuilder>( + future: queryBooksRecordOnce( + queryBuilder: (booksRecord) => booksRecord + .where( + 'category', + isEqualTo: 'academics', + ) + .orderBy('createdAt', descending: true), + limit: 10, + ), + builder: (context, snapshot) { + // Customize what your widget looks like when it's loading. + if (!snapshot.hasData) { + return Center( + child: SizedBox( + width: 50.0, + height: 50.0, + child: CircularProgressIndicator( + valueColor: AlwaysStoppedAnimation( + FlutterFlowTheme.of(context).primary, ), - ); - }, - child: Container( - width: 200.0, - height: 100.0, - decoration: BoxDecoration( - color: FlutterFlowTheme.of(context) - .secondaryBackground, - boxShadow: [ - BoxShadow( - blurRadius: 4.0, - color: Color(0x430F1113), - offset: Offset( - 0.0, - 1.0, - ), - ) - ], - borderRadius: BorderRadius.circular(12.0), ), - child: Padding( - padding: EdgeInsets.all(8.0), - child: Column( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Hero( - tag: 'locationImage', - transitionOnUserGestures: true, - child: ClipRRect( - borderRadius: - BorderRadius.circular(8.0), - child: Image.asset( - 'assets/images/photo_2022-06-26_17-53-24.jpg', - width: double.infinity, - height: 220.0, - fit: BoxFit.cover, + ), + ); + } + List listViewBooksRecordList = + snapshot.data!; + + return ListView.builder( + padding: EdgeInsets.zero, + primary: false, + shrinkWrap: true, + scrollDirection: Axis.horizontal, + itemCount: listViewBooksRecordList.length, + itemBuilder: (context, listViewIndex) { + final listViewBooksRecord = + listViewBooksRecordList[listViewIndex]; + return Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 16.0, 8.0, 0.0, 8.0), + child: InkWell( + splashColor: Colors.transparent, + focusColor: Colors.transparent, + hoverColor: Colors.transparent, + highlightColor: Colors.transparent, + onTap: () async { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text( + 'Book Preview and download not available in this pre-test application.', + style: TextStyle( + color: FlutterFlowTheme.of(context) + .primaryText, ), ), + duration: Duration(milliseconds: 4000), + backgroundColor: + FlutterFlowTheme.of(context) + .secondary, ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 16.0, 0.0, 0.0), - child: Text( - 'Freshman', - style: FlutterFlowTheme.of(context) - .headlineSmall - .override( - fontFamily: 'Outfit', - letterSpacing: 0.0, + ); + }, + child: Container( + width: 200.0, + height: 100.0, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context) + .secondaryBackground, + boxShadow: [ + BoxShadow( + blurRadius: 4.0, + color: Color(0x430F1113), + offset: Offset( + 0.0, + 1.0, + ), + ) + ], + borderRadius: BorderRadius.circular(12.0), + ), + child: Padding( + padding: EdgeInsets.all(8.0), + child: Column( + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Hero( + tag: listViewBooksRecord.imageLink, + transitionOnUserGestures: true, + child: ClipRRect( + borderRadius: + BorderRadius.circular(8.0), + child: OctoImage( + placeholderBuilder: (_) => + SizedBox.expand( + child: Image( + image: BlurHashImage( + listViewBooksRecord + .photoBlurHash), + fit: BoxFit.cover, + ), + ), + image: NetworkImage( + listViewBooksRecord.imageLink, + ), + width: double.infinity, + height: 220.0, + fit: BoxFit.cover, ), - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 4.0, 0.0, 0.0), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Icon( - Icons.download, - color: - FlutterFlowTheme.of(context) - .primary, - size: 24.0, ), - Text( - '412', + ), + Padding( + padding: + EdgeInsetsDirectional.fromSTEB( + 0.0, 16.0, 0.0, 0.0), + child: Text( + valueOrDefault( + functions.trimBookTitle( + listViewBooksRecord.title), + 'No Title', + ), style: FlutterFlowTheme.of(context) - .bodyMedium + .headlineSmall .override( - fontFamily: 'Figtree', + fontFamily: 'Outfit', letterSpacing: 0.0, ), ), - ], - ), - ), - Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ + ), Padding( padding: EdgeInsetsDirectional.fromSTEB( - 4.0, 4.0, 0.0, 0.0), - child: Text( - 'View Now', - style: - FlutterFlowTheme.of(context) - .labelMedium + 0.0, 4.0, 0.0, 0.0), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Icon( + Icons.download, + color: FlutterFlowTheme.of( + context) + .primary, + size: 24.0, + ), + Text( + '412', + style: FlutterFlowTheme.of( + context) + .bodyMedium .override( fontFamily: 'Figtree', letterSpacing: 0.0, ), - ), - ), - Icon( - Icons.navigate_next, - color: Colors.black, - size: 24.0, - ), - ], - ), - ], - ), - ), - ), - ).animateOnPageLoad(animationsMap[ - 'containerOnPageLoadAnimation4']!), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 8.0, 8.0, 0.0, 8.0), - child: Container( - width: 200.0, - height: 100.0, - decoration: BoxDecoration( - color: FlutterFlowTheme.of(context) - .secondaryBackground, - boxShadow: [ - BoxShadow( - blurRadius: 4.0, - color: Color(0x430F1113), - offset: Offset( - 0.0, - 1.0, - ), - ) - ], - borderRadius: BorderRadius.circular(12.0), - ), - child: Padding( - padding: EdgeInsets.all(8.0), - child: Column( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ClipRRect( - borderRadius: BorderRadius.circular(8.0), - child: Image.asset( - 'assets/images/photo_2022-06-26_19-40-29.jpg', - width: double.infinity, - height: 220.0, - fit: BoxFit.cover, - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 16.0, 0.0, 0.0), - child: Text( - 'Frances Howard ', - style: FlutterFlowTheme.of(context) - .headlineSmall - .override( - fontFamily: 'Outfit', - letterSpacing: 0.0, - ), - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 4.0, 0.0, 0.0), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Icon( - Icons.download, - color: FlutterFlowTheme.of(context) - .primary, - size: 24.0, - ), - Text( - '1.2k', - style: FlutterFlowTheme.of(context) - .bodyMedium - .override( - fontFamily: 'Figtree', - letterSpacing: 0.0, - ), - ), - ], - ), - ), - Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Padding( - padding: - EdgeInsetsDirectional.fromSTEB( - 4.0, 4.0, 0.0, 0.0), - child: Text( - 'View Now', - style: FlutterFlowTheme.of(context) - .labelMedium - .override( - fontFamily: 'Figtree', - letterSpacing: 0.0, ), - ), - ), - Padding( - padding: - EdgeInsetsDirectional.fromSTEB( - 0.0, 4.0, 0.0, 0.0), - child: Icon( - Icons.keyboard_arrow_right_rounded, - color: FlutterFlowTheme.of(context) - .secondaryText, - size: 24.0, - ), - ), - ], - ), - ], - ), - ), - ).animateOnPageLoad(animationsMap[ - 'containerOnPageLoadAnimation5']!), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 8.0, 8.0, 16.0, 8.0), - child: Container( - width: 200.0, - height: 100.0, - decoration: BoxDecoration( - color: FlutterFlowTheme.of(context) - .secondaryBackground, - boxShadow: [ - BoxShadow( - blurRadius: 4.0, - color: Color(0x430F1113), - offset: Offset( - 0.0, - 1.0, - ), - ) - ], - borderRadius: BorderRadius.circular(12.0), - ), - child: Padding( - padding: EdgeInsets.all(8.0), - child: Column( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ClipRRect( - borderRadius: BorderRadius.circular(8.0), - child: Image.asset( - 'assets/images/photo_2022-06-26_19-40-17.jpg', - width: double.infinity, - height: 220.0, - fit: BoxFit.cover, - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 16.0, 0.0, 0.0), - child: Text( - 'Oxford Grammar', - style: FlutterFlowTheme.of(context) - .headlineSmall - .override( - fontFamily: 'Outfit', - letterSpacing: 0.0, + ], ), - ), - ), - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0.0, 4.0, 0.0, 0.0), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Icon( - Icons.download, - color: FlutterFlowTheme.of(context) - .primary, - size: 24.0, ), - Text( - '1.2k', - style: FlutterFlowTheme.of(context) - .bodyMedium - .override( - fontFamily: 'Figtree', - letterSpacing: 0.0, + Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Padding( + padding: EdgeInsetsDirectional + .fromSTEB( + 4.0, 4.0, 0.0, 0.0), + child: Text( + 'View Now', + style: FlutterFlowTheme.of( + context) + .labelMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), ), + ), + Icon( + Icons.navigate_next, + color: Colors.black, + size: 24.0, + ), + ], ), ], ), ), - Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Padding( - padding: - EdgeInsetsDirectional.fromSTEB( - 4.0, 4.0, 0.0, 0.0), - child: Text( - 'View Now', - style: FlutterFlowTheme.of(context) - .labelMedium - .override( - fontFamily: 'Figtree', - letterSpacing: 0.0, - ), - ), - ), - Padding( - padding: - EdgeInsetsDirectional.fromSTEB( - 0.0, 4.0, 0.0, 0.0), - child: Icon( - Icons.keyboard_arrow_right_rounded, - color: FlutterFlowTheme.of(context) - .secondaryText, - size: 24.0, - ), - ), - ], - ), - ], - ), - ), - ).animateOnPageLoad(animationsMap[ - 'containerOnPageLoadAnimation6']!), - ), - ], + ), + ).animateOnPageLoad(animationsMap[ + 'containerOnPageLoadAnimation2']!), + ); + }, + ); + }, ), ), ), diff --git a/lib/pages/create_post/create_post_model.dart b/lib/pages/create_post/create_post_model.dart index d156d96..f9e22ec 100644 --- a/lib/pages/create_post/create_post_model.dart +++ b/lib/pages/create_post/create_post_model.dart @@ -10,6 +10,7 @@ import '/flutter_flow/flutter_flow_video_player.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/form_field_controller.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'create_post_widget.dart' show CreatePostWidget; import 'package:cloud_firestore/cloud_firestore.dart'; diff --git a/lib/pages/create_post/create_post_widget.dart b/lib/pages/create_post/create_post_widget.dart index dde809c..83520f1 100644 --- a/lib/pages/create_post/create_post_widget.dart +++ b/lib/pages/create_post/create_post_widget.dart @@ -10,6 +10,7 @@ import '/flutter_flow/flutter_flow_video_player.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/form_field_controller.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; @@ -52,7 +53,10 @@ class _CreatePostWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, diff --git a/lib/pages/create_story/create_story_model.dart b/lib/pages/create_story/create_story_model.dart index 1787d9e..d3e2101 100644 --- a/lib/pages/create_story/create_story_model.dart +++ b/lib/pages/create_story/create_story_model.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_video_player.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'create_story_widget.dart' show CreateStoryWidget; import 'package:cloud_firestore/cloud_firestore.dart'; diff --git a/lib/pages/create_story/create_story_widget.dart b/lib/pages/create_story/create_story_widget.dart index 389fc91..80ff92e 100644 --- a/lib/pages/create_story/create_story_widget.dart +++ b/lib/pages/create_story/create_story_widget.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_video_player.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; @@ -589,6 +590,8 @@ class _CreateStoryWidgetState extends State { photoBlurHash: _model.uploadedLocalFile3.blurHash, uid: currentUserUid, + expiredDate: functions + .expiredDateMaker(getCurrentTimestamp), )); context.pushNamed('main_Feed'); diff --git a/lib/pages/edit_user_profile/edit_user_profile_model.dart b/lib/pages/edit_user_profile/edit_user_profile_model.dart index e8bbba4..1f71851 100644 --- a/lib/pages/edit_user_profile/edit_user_profile_model.dart +++ b/lib/pages/edit_user_profile/edit_user_profile_model.dart @@ -6,6 +6,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import 'edit_user_profile_widget.dart' show EditUserProfileWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/edit_user_profile/edit_user_profile_widget.dart b/lib/pages/edit_user_profile/edit_user_profile_widget.dart index a4854ca..d51a582 100644 --- a/lib/pages/edit_user_profile/edit_user_profile_widget.dart +++ b/lib/pages/edit_user_profile/edit_user_profile_widget.dart @@ -6,6 +6,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/aastu/aastu_model.dart b/lib/pages/features/aastu/aastu_model.dart index cd9115e..a31e1d3 100644 --- a/lib/pages/features/aastu/aastu_model.dart +++ b/lib/pages/features/aastu/aastu_model.dart @@ -2,6 +2,7 @@ import '/flutter_flow/flutter_flow_icon_button.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'aastu_widget.dart' show AastuWidget; import 'package:map_launcher/map_launcher.dart' as $ml; diff --git a/lib/pages/features/aastu/aastu_widget.dart b/lib/pages/features/aastu/aastu_widget.dart index 30bf56f..5f56a3d 100644 --- a/lib/pages/features/aastu/aastu_widget.dart +++ b/lib/pages/features/aastu/aastu_widget.dart @@ -2,6 +2,7 @@ import '/flutter_flow/flutter_flow_icon_button.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'package:map_launcher/map_launcher.dart' as $ml; import 'package:flutter/material.dart'; @@ -40,7 +41,10 @@ class _AastuWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).secondaryBackground, @@ -305,7 +309,7 @@ class _AastuWidgetState extends State { color: FlutterFlowTheme.of( context) - .secondary, + .primary, borderRadius: BorderRadius.circular( 8.0), diff --git a/lib/pages/features/academic_calendar/academic_calendar_model.dart b/lib/pages/features/academic_calendar/academic_calendar_model.dart index 9c6c0aa..52f2fa3 100644 --- a/lib/pages/features/academic_calendar/academic_calendar_model.dart +++ b/lib/pages/features/academic_calendar/academic_calendar_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_pdf_viewer.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'academic_calendar_widget.dart' show AcademicCalendarWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/academic_calendar/academic_calendar_widget.dart b/lib/pages/features/academic_calendar/academic_calendar_widget.dart index be9010f..208a736 100644 --- a/lib/pages/features/academic_calendar/academic_calendar_widget.dart +++ b/lib/pages/features/academic_calendar/academic_calendar_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_pdf_viewer.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; @@ -40,7 +41,10 @@ class _AcademicCalendarWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, diff --git a/lib/pages/features/components/add_note/add_note_model.dart b/lib/pages/features/components/add_note/add_note_model.dart index e64849b..367f3a8 100644 --- a/lib/pages/features/components/add_note/add_note_model.dart +++ b/lib/pages/features/components/add_note/add_note_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:async'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'add_note_widget.dart' show AddNoteWidget; import 'package:cloud_firestore/cloud_firestore.dart'; diff --git a/lib/pages/features/components/add_note/add_note_widget.dart b/lib/pages/features/components/add_note/add_note_widget.dart index bbec602..c59960d 100644 --- a/lib/pages/features/components/add_note/add_note_widget.dart +++ b/lib/pages/features/components/add_note/add_note_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:async'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/foundation.dart'; @@ -786,7 +787,9 @@ class _AddNoteWidgetState extends State { child: Container( height: 33.0, decoration: BoxDecoration( - color: Color(0xFFEDEAFD), + color: FlutterFlowTheme.of( + context) + .chipcolor, borderRadius: BorderRadius.circular( 8.0), @@ -888,7 +891,9 @@ class _AddNoteWidgetState extends State { child: Container( height: 33.0, decoration: BoxDecoration( - color: Color(0xFFE4FCFF), + color: FlutterFlowTheme.of( + context) + .lightgreen, borderRadius: BorderRadius.circular( 8.0), @@ -990,7 +995,9 @@ class _AddNoteWidgetState extends State { child: Container( height: 33.0, decoration: BoxDecoration( - color: Color(0xFFFFECF2), + color: FlutterFlowTheme.of( + context) + .lightRed, borderRadius: BorderRadius.circular( 8.0), diff --git a/lib/pages/features/components/choice_list_item/choice_list_item_model.dart b/lib/pages/features/components/choice_list_item/choice_list_item_model.dart index 6a1db64..fc5b35b 100644 --- a/lib/pages/features/components/choice_list_item/choice_list_item_model.dart +++ b/lib/pages/features/components/choice_list_item/choice_list_item_model.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'choice_list_item_widget.dart' show ChoiceListItemWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/components/choice_list_item/choice_list_item_widget.dart b/lib/pages/features/components/choice_list_item/choice_list_item_widget.dart index 4dd09b5..cbb8d6a 100644 --- a/lib/pages/features/components/choice_list_item/choice_list_item_widget.dart +++ b/lib/pages/features/components/choice_list_item/choice_list_item_widget.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/pages/features/components/delete_account/delete_account_model.dart b/lib/pages/features/components/delete_account/delete_account_model.dart index cbc0cd8..0940fc9 100644 --- a/lib/pages/features/components/delete_account/delete_account_model.dart +++ b/lib/pages/features/components/delete_account/delete_account_model.dart @@ -4,6 +4,7 @@ import '/backend/schema/structs/index.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'delete_account_widget.dart' show DeleteAccountWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/features/components/delete_account/delete_account_widget.dart b/lib/pages/features/components/delete_account/delete_account_widget.dart index e6624de..25f9e11 100644 --- a/lib/pages/features/components/delete_account/delete_account_widget.dart +++ b/lib/pages/features/components/delete_account/delete_account_widget.dart @@ -4,6 +4,7 @@ import '/backend/schema/structs/index.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/components/delete_virtual_i_d/delete_virtual_i_d_model.dart b/lib/pages/features/components/delete_virtual_i_d/delete_virtual_i_d_model.dart index 4ff471a..620a80c 100644 --- a/lib/pages/features/components/delete_virtual_i_d/delete_virtual_i_d_model.dart +++ b/lib/pages/features/components/delete_virtual_i_d/delete_virtual_i_d_model.dart @@ -3,6 +3,7 @@ import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'delete_virtual_i_d_widget.dart' show DeleteVirtualIDWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/features/components/delete_virtual_i_d/delete_virtual_i_d_widget.dart b/lib/pages/features/components/delete_virtual_i_d/delete_virtual_i_d_widget.dart index 11f3078..7266763 100644 --- a/lib/pages/features/components/delete_virtual_i_d/delete_virtual_i_d_widget.dart +++ b/lib/pages/features/components/delete_virtual_i_d/delete_virtual_i_d_widget.dart @@ -3,6 +3,7 @@ import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/components/download_virtual_i_d/download_virtual_i_d_model.dart b/lib/pages/features/components/download_virtual_i_d/download_virtual_i_d_model.dart index 05ce781..b2e940f 100644 --- a/lib/pages/features/components/download_virtual_i_d/download_virtual_i_d_model.dart +++ b/lib/pages/features/components/download_virtual_i_d/download_virtual_i_d_model.dart @@ -1,6 +1,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'download_virtual_i_d_widget.dart' show DownloadVirtualIDWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/components/download_virtual_i_d/download_virtual_i_d_widget.dart b/lib/pages/features/components/download_virtual_i_d/download_virtual_i_d_widget.dart index 98c775b..9bfee31 100644 --- a/lib/pages/features/components/download_virtual_i_d/download_virtual_i_d_widget.dart +++ b/lib/pages/features/components/download_virtual_i_d/download_virtual_i_d_widget.dart @@ -1,6 +1,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/pages/features/components/empty_list_task/empty_list_task_model.dart b/lib/pages/features/components/empty_list_task/empty_list_task_model.dart index 176b0c7..6b4f7cf 100644 --- a/lib/pages/features/components/empty_list_task/empty_list_task_model.dart +++ b/lib/pages/features/components/empty_list_task/empty_list_task_model.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'empty_list_task_widget.dart' show EmptyListTaskWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/components/empty_list_task/empty_list_task_widget.dart b/lib/pages/features/components/empty_list_task/empty_list_task_widget.dart index b32bdc9..f919c5a 100644 --- a/lib/pages/features/components/empty_list_task/empty_list_task_widget.dart +++ b/lib/pages/features/components/empty_list_task/empty_list_task_widget.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/pages/features/components/empty_list_task_completed/empty_list_task_completed_model.dart b/lib/pages/features/components/empty_list_task_completed/empty_list_task_completed_model.dart index a661fc5..8fd6185 100644 --- a/lib/pages/features/components/empty_list_task_completed/empty_list_task_completed_model.dart +++ b/lib/pages/features/components/empty_list_task_completed/empty_list_task_completed_model.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'empty_list_task_completed_widget.dart' show EmptyListTaskCompletedWidget; import 'package:flutter/material.dart'; diff --git a/lib/pages/features/components/empty_list_task_completed/empty_list_task_completed_widget.dart b/lib/pages/features/components/empty_list_task_completed/empty_list_task_completed_widget.dart index 63f8a52..2686321 100644 --- a/lib/pages/features/components/empty_list_task_completed/empty_list_task_completed_widget.dart +++ b/lib/pages/features/components/empty_list_task_completed/empty_list_task_completed_widget.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/pages/features/components/quiz_generator/quiz_generator_model.dart b/lib/pages/features/components/quiz_generator/quiz_generator_model.dart index 85aa625..d687c3c 100644 --- a/lib/pages/features/components/quiz_generator/quiz_generator_model.dart +++ b/lib/pages/features/components/quiz_generator/quiz_generator_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:async'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import '/flutter_flow/custom_functions.dart' as functions; import 'quiz_generator_widget.dart' show QuizGeneratorWidget; diff --git a/lib/pages/features/components/quiz_generator/quiz_generator_widget.dart b/lib/pages/features/components/quiz_generator/quiz_generator_widget.dart index 759fa81..bb65b4e 100644 --- a/lib/pages/features/components/quiz_generator/quiz_generator_widget.dart +++ b/lib/pages/features/components/quiz_generator/quiz_generator_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:async'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import '/flutter_flow/custom_functions.dart' as functions; import 'package:flutter/material.dart'; @@ -379,22 +380,6 @@ class _QuizGeneratorWidgetState extends State { _model.courseContentTextController ?.text = _model.pastedText!; - _model - .courseContentFocusNode - ?.requestFocus(); - WidgetsBinding.instance - .addPostFrameCallback( - (_) { - _model.courseContentTextController - ?.selection = - TextSelection - .collapsed( - offset: _model - .courseContentTextController! - .text - .length, - ); - }); }); safeSetState(() {}); diff --git a/lib/pages/features/components/task_action/task_action_model.dart b/lib/pages/features/components/task_action/task_action_model.dart index a7b51ea..328f48b 100644 --- a/lib/pages/features/components/task_action/task_action_model.dart +++ b/lib/pages/features/components/task_action/task_action_model.dart @@ -2,6 +2,7 @@ import '/auth/firebase_auth/auth_util.dart'; import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'task_action_widget.dart' show TaskActionWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/features/components/task_action/task_action_widget.dart b/lib/pages/features/components/task_action/task_action_widget.dart index 89155a7..a6ab8d3 100644 --- a/lib/pages/features/components/task_action/task_action_widget.dart +++ b/lib/pages/features/components/task_action/task_action_widget.dart @@ -2,6 +2,7 @@ import '/auth/firebase_auth/auth_util.dart'; import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/daily_negarit/daily_negarit_model.dart b/lib/pages/features/daily_negarit/daily_negarit_model.dart index e296453..92ecab9 100644 --- a/lib/pages/features/daily_negarit/daily_negarit_model.dart +++ b/lib/pages/features/daily_negarit/daily_negarit_model.dart @@ -8,6 +8,7 @@ import '/pages/features/components/add_note/add_note_widget.dart'; import '/pages/features/components/empty_list_task/empty_list_task_widget.dart'; import '/pages/features/components/empty_list_task_completed/empty_list_task_completed_widget.dart'; import '/pages/features/components/task_action/task_action_widget.dart'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'daily_negarit_widget.dart' show DailyNegaritWidget; import 'package:aligned_dialog/aligned_dialog.dart'; diff --git a/lib/pages/features/daily_negarit/daily_negarit_widget.dart b/lib/pages/features/daily_negarit/daily_negarit_widget.dart index 8d11c70..19f8fb1 100644 --- a/lib/pages/features/daily_negarit/daily_negarit_widget.dart +++ b/lib/pages/features/daily_negarit/daily_negarit_widget.dart @@ -8,6 +8,7 @@ import '/pages/features/components/add_note/add_note_widget.dart'; import '/pages/features/components/empty_list_task/empty_list_task_widget.dart'; import '/pages/features/components/empty_list_task_completed/empty_list_task_completed_widget.dart'; import '/pages/features/components/task_action/task_action_widget.dart'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'package:aligned_dialog/aligned_dialog.dart'; import 'package:flutter/gestures.dart'; @@ -50,7 +51,10 @@ class _DailyNegaritWidgetState extends State { context.watch(); return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, @@ -64,7 +68,10 @@ class _DailyNegaritWidgetState extends State { builder: (context) { return WebViewAware( child: GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Padding( padding: MediaQuery.viewInsetsOf(context), child: AddNoteWidget(), @@ -507,7 +514,10 @@ class _DailyNegaritWidgetState extends State { WebViewAware( child: GestureDetector( - onTap: () => FocusScope.of(dialogContext).unfocus(), + onTap: () { + FocusScope.of(dialogContext).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: TaskActionWidget( task: listViewMyNotesRecord.reference, showMark: true, @@ -996,7 +1006,10 @@ class _DailyNegaritWidgetState extends State { child: WebViewAware( child: GestureDetector( - onTap: () => FocusScope.of(dialogContext).unfocus(), + onTap: () { + FocusScope.of(dialogContext).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: TaskActionWidget( task: listViewMyNotesRecord.reference, showMark: false, diff --git a/lib/pages/features/empty_page/empty_page_model.dart b/lib/pages/features/empty_page/empty_page_model.dart index d8b7791..6943cf1 100644 --- a/lib/pages/features/empty_page/empty_page_model.dart +++ b/lib/pages/features/empty_page/empty_page_model.dart @@ -3,6 +3,7 @@ import '/backend/schema/structs/index.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'empty_page_widget.dart' show EmptyPageWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/empty_page/empty_page_widget.dart b/lib/pages/features/empty_page/empty_page_widget.dart index ad7cf7d..f18de62 100644 --- a/lib/pages/features/empty_page/empty_page_widget.dart +++ b/lib/pages/features/empty_page/empty_page_widget.dart @@ -3,6 +3,7 @@ import '/backend/schema/structs/index.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; @@ -39,7 +40,10 @@ class _EmptyPageWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, diff --git a/lib/pages/features/engineers_assoc/engineers_assoc_model.dart b/lib/pages/features/engineers_assoc/engineers_assoc_model.dart index bdf7343..15a31e7 100644 --- a/lib/pages/features/engineers_assoc/engineers_assoc_model.dart +++ b/lib/pages/features/engineers_assoc/engineers_assoc_model.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; import 'dart:math'; +import 'dart:ui'; import 'engineers_assoc_widget.dart' show EngineersAssocWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/features/engineers_assoc/engineers_assoc_widget.dart b/lib/pages/features/engineers_assoc/engineers_assoc_widget.dart index 23a0dec..87601b5 100644 --- a/lib/pages/features/engineers_assoc/engineers_assoc_widget.dart +++ b/lib/pages/features/engineers_assoc/engineers_assoc_widget.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; import 'dart:math'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; @@ -65,7 +66,10 @@ class _EngineersAssocWidgetState extends State @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, diff --git a/lib/pages/features/gallery/gallery_model.dart b/lib/pages/features/gallery/gallery_model.dart index c67ab10..f30f724 100644 --- a/lib/pages/features/gallery/gallery_model.dart +++ b/lib/pages/features/gallery/gallery_model.dart @@ -9,6 +9,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; import 'dart:math'; +import 'dart:ui'; import 'gallery_widget.dart' show GalleryWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/features/gallery/gallery_widget.dart b/lib/pages/features/gallery/gallery_widget.dart index c3d3442..e9f3894 100644 --- a/lib/pages/features/gallery/gallery_widget.dart +++ b/lib/pages/features/gallery/gallery_widget.dart @@ -9,6 +9,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; import 'dart:math'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; @@ -69,7 +70,10 @@ class _GalleryWidgetState extends State @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, diff --git a/lib/pages/features/grade_calulator/grade_calulator_model.dart b/lib/pages/features/grade_calulator/grade_calulator_model.dart index 287fa5a..16d136b 100644 --- a/lib/pages/features/grade_calulator/grade_calulator_model.dart +++ b/lib/pages/features/grade_calulator/grade_calulator_model.dart @@ -10,6 +10,7 @@ import '/components/save_gpa_component/save_gpa_component_widget.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import '/flutter_flow/custom_functions.dart' as functions; import '/flutter_flow/random_data_util.dart' as random_data; diff --git a/lib/pages/features/grade_calulator/grade_calulator_widget.dart b/lib/pages/features/grade_calulator/grade_calulator_widget.dart index b82f36f..55a4c3c 100644 --- a/lib/pages/features/grade_calulator/grade_calulator_widget.dart +++ b/lib/pages/features/grade_calulator/grade_calulator_widget.dart @@ -10,6 +10,7 @@ import '/components/save_gpa_component/save_gpa_component_widget.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import '/flutter_flow/custom_functions.dart' as functions; import '/flutter_flow/random_data_util.dart' as random_data; @@ -54,7 +55,10 @@ class _GradeCalulatorWidgetState extends State { context.watch(); return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, @@ -425,7 +429,8 @@ class _GradeCalulatorWidgetState extends State { width: double.infinity, decoration: BoxDecoration( color: valueOrDefault( - _model.colors[_model.colorIndex], + _model.colors + .elementAtOrNull(_model.colorIndex), Color(0x2604812F), ), borderRadius: BorderRadius.circular(10.0), @@ -781,10 +786,15 @@ class _GradeCalulatorWidgetState extends State { context)), child: WebViewAware( child: GestureDetector( - onTap: () => - FocusScope.of( - dialogContext) - .unfocus(), + onTap: () { + FocusScope.of( + dialogContext) + .unfocus(); + FocusManager + .instance + .primaryFocus + ?.unfocus(); + }, child: SaveGpaComponentWidget( result: @@ -1473,8 +1483,11 @@ class _GradeCalulatorWidgetState extends State { WebViewAware( child: GestureDetector( - onTap: () => - FocusScope.of(dialogContext).unfocus(), + onTap: + () { + FocusScope.of(dialogContext).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: DeleteGradeHistoryWidget( mygradeRef: listViewMyGradeRecord.reference, diff --git a/lib/pages/features/grading_system/grading_system_model.dart b/lib/pages/features/grading_system/grading_system_model.dart index 18b6a42..81b0467 100644 --- a/lib/pages/features/grading_system/grading_system_model.dart +++ b/lib/pages/features/grading_system/grading_system_model.dart @@ -2,6 +2,7 @@ import '/flutter_flow/flutter_flow_icon_button.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'grading_system_widget.dart' show GradingSystemWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/grading_system/grading_system_widget.dart b/lib/pages/features/grading_system/grading_system_widget.dart index a7e1e94..1fd285a 100644 --- a/lib/pages/features/grading_system/grading_system_widget.dart +++ b/lib/pages/features/grading_system/grading_system_widget.dart @@ -2,6 +2,7 @@ import '/flutter_flow/flutter_flow_icon_button.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; @@ -38,7 +39,10 @@ class _GradingSystemWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, diff --git a/lib/pages/features/n_f_c_reader/n_f_c_reader_model.dart b/lib/pages/features/n_f_c_reader/n_f_c_reader_model.dart index 659a7fa..bbd0ca9 100644 --- a/lib/pages/features/n_f_c_reader/n_f_c_reader_model.dart +++ b/lib/pages/features/n_f_c_reader/n_f_c_reader_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'n_f_c_reader_widget.dart' show NFCReaderWidget; import 'package:flutter/material.dart'; diff --git a/lib/pages/features/n_f_c_reader/n_f_c_reader_widget.dart b/lib/pages/features/n_f_c_reader/n_f_c_reader_widget.dart index f863b6b..82d3eec 100644 --- a/lib/pages/features/n_f_c_reader/n_f_c_reader_widget.dart +++ b/lib/pages/features/n_f_c_reader/n_f_c_reader_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; @@ -82,7 +83,10 @@ class _NFCReaderWidgetState extends State @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).secondaryBackground, diff --git a/lib/pages/features/quiz_page/quiz_page_model.dart b/lib/pages/features/quiz_page/quiz_page_model.dart index 7af5be9..2af5a8c 100644 --- a/lib/pages/features/quiz_page/quiz_page_model.dart +++ b/lib/pages/features/quiz_page/quiz_page_model.dart @@ -7,6 +7,7 @@ import '/flutter_flow/flutter_flow_widgets.dart'; import '/pages/features/components/choice_list_item/choice_list_item_widget.dart'; import '/pages/features/components/quiz_generator/quiz_generator_widget.dart'; import 'dart:math'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'quiz_page_widget.dart' show QuizPageWidget; import 'package:flutter/material.dart'; diff --git a/lib/pages/features/quiz_page/quiz_page_widget.dart b/lib/pages/features/quiz_page/quiz_page_widget.dart index a4c2461..450271c 100644 --- a/lib/pages/features/quiz_page/quiz_page_widget.dart +++ b/lib/pages/features/quiz_page/quiz_page_widget.dart @@ -7,6 +7,7 @@ import '/flutter_flow/flutter_flow_widgets.dart'; import '/pages/features/components/choice_list_item/choice_list_item_widget.dart'; import '/pages/features/components/quiz_generator/quiz_generator_widget.dart'; import 'dart:math'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; @@ -73,7 +74,10 @@ class _QuizPageWidgetState extends State context.watch(); return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, @@ -89,7 +93,10 @@ class _QuizPageWidgetState extends State builder: (context) { return WebViewAware( child: GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Padding( padding: MediaQuery.viewInsetsOf(context), child: QuizGeneratorWidget(), @@ -369,8 +376,9 @@ class _QuizPageWidgetState extends State .alternate, ), choice: allQuestionsItem - .choices[ - currentQuestionChoiceIndex], + .choices + .elementAtOrNull( + currentQuestionChoiceIndex)!, ), ); }), @@ -510,9 +518,13 @@ class _QuizPageWidgetState extends State builder: (context) { return WebViewAware( child: GestureDetector( - onTap: () => - FocusScope.of(context) - .unfocus(), + onTap: () { + FocusScope.of(context) + .unfocus(); + FocusManager + .instance.primaryFocus + ?.unfocus(); + }, child: Padding( padding: MediaQuery.viewInsetsOf( @@ -582,9 +594,13 @@ class _QuizPageWidgetState extends State builder: (context) { return WebViewAware( child: GestureDetector( - onTap: () => - FocusScope.of(context) - .unfocus(), + onTap: () { + FocusScope.of(context) + .unfocus(); + FocusManager + .instance.primaryFocus + ?.unfocus(); + }, child: Padding( padding: MediaQuery.viewInsetsOf( @@ -665,9 +681,13 @@ class _QuizPageWidgetState extends State builder: (context) { return WebViewAware( child: GestureDetector( - onTap: () => - FocusScope.of(context) - .unfocus(), + onTap: () { + FocusScope.of(context) + .unfocus(); + FocusManager + .instance.primaryFocus + ?.unfocus(); + }, child: Padding( padding: MediaQuery.viewInsetsOf( @@ -737,9 +757,13 @@ class _QuizPageWidgetState extends State builder: (context) { return WebViewAware( child: GestureDetector( - onTap: () => - FocusScope.of(context) - .unfocus(), + onTap: () { + FocusScope.of(context) + .unfocus(); + FocusManager + .instance.primaryFocus + ?.unfocus(); + }, child: Padding( padding: MediaQuery.viewInsetsOf( diff --git a/lib/pages/features/register_i_d/register_i_d_model.dart b/lib/pages/features/register_i_d/register_i_d_model.dart index ea46c31..77f51f9 100644 --- a/lib/pages/features/register_i_d/register_i_d_model.dart +++ b/lib/pages/features/register_i_d/register_i_d_model.dart @@ -7,6 +7,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/form_field_controller.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'register_i_d_widget.dart' show RegisterIDWidget; import 'package:cloud_firestore/cloud_firestore.dart'; diff --git a/lib/pages/features/register_i_d/register_i_d_widget.dart b/lib/pages/features/register_i_d/register_i_d_widget.dart index 0395f51..c28f239 100644 --- a/lib/pages/features/register_i_d/register_i_d_widget.dart +++ b/lib/pages/features/register_i_d/register_i_d_widget.dart @@ -7,6 +7,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/form_field_controller.dart'; import '/flutter_flow/upload_data.dart'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; @@ -222,18 +223,6 @@ class _RegisterIDWidgetState extends State { safeSetState(() { _model.barCodeTextController?.text = _model.resultBarcode!; - _model.barCodeFocusNode?.requestFocus(); - WidgetsBinding.instance - .addPostFrameCallback((_) { - _model.barCodeTextController - ?.selection = - TextSelection.collapsed( - offset: _model - .barCodeTextController! - .text - .length, - ); - }); }); } else { ScaffoldMessenger.of(context) @@ -347,7 +336,8 @@ class _RegisterIDWidgetState extends State { borderRadius: BorderRadius.circular(8.0), ), filled: true, - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, contentPadding: EdgeInsetsDirectional.fromSTEB( 20.0, 24.0, 20.0, 24.0), @@ -428,7 +418,8 @@ class _RegisterIDWidgetState extends State { BorderRadius.circular(8.0), ), filled: true, - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, contentPadding: EdgeInsetsDirectional.fromSTEB( 20.0, 24.0, 20.0, 24.0), @@ -511,7 +502,8 @@ class _RegisterIDWidgetState extends State { BorderRadius.circular(8.0), ), filled: true, - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, contentPadding: EdgeInsetsDirectional.fromSTEB( 20.0, 24.0, 20.0, 24.0), @@ -580,7 +572,8 @@ class _RegisterIDWidgetState extends State { .secondaryText, size: 24.0, ), - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, elevation: 2.0, borderColor: Colors.transparent, borderWidth: 0.0, @@ -625,7 +618,8 @@ class _RegisterIDWidgetState extends State { .secondaryText, size: 24.0, ), - fillColor: Color(0xFFF8F8F8), + fillColor: FlutterFlowTheme.of(context) + .inputBackground, elevation: 2.0, borderColor: Colors.transparent, borderWidth: 0.0, @@ -723,7 +717,8 @@ class _RegisterIDWidgetState extends State { }, child: Container( decoration: BoxDecoration( - color: Color(0xFFF8F8F8), + color: FlutterFlowTheme.of(context) + .inputBackground, borderRadius: BorderRadius.circular(6.0), ), child: Padding( diff --git a/lib/pages/features/religious_community/religious_community_model.dart b/lib/pages/features/religious_community/religious_community_model.dart index 36c47cb..0867076 100644 --- a/lib/pages/features/religious_community/religious_community_model.dart +++ b/lib/pages/features/religious_community/religious_community_model.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; import 'dart:math'; +import 'dart:ui'; import 'religious_community_widget.dart' show ReligiousCommunityWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; @@ -16,6 +17,7 @@ import 'package:flutter_animate/flutter_animate.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; class ReligiousCommunityModel extends FlutterFlowModel { diff --git a/lib/pages/features/religious_community/religious_community_widget.dart b/lib/pages/features/religious_community/religious_community_widget.dart index 26c5e1d..bd941df 100644 --- a/lib/pages/features/religious_community/religious_community_widget.dart +++ b/lib/pages/features/religious_community/religious_community_widget.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/flutter_flow/upload_data.dart'; import 'dart:math'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; @@ -15,6 +16,7 @@ import 'package:flutter_animate/flutter_animate.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; +import 'package:url_launcher/url_launcher.dart'; import 'religious_community_model.dart'; export 'religious_community_model.dart'; @@ -67,7 +69,10 @@ class _ReligiousCommunityWidgetState extends State @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, @@ -257,15 +262,26 @@ class _ReligiousCommunityWidgetState extends State mainAxisSize: MainAxisSize.max, children: [ Expanded( - child: ClipRRect( - borderRadius: - BorderRadius.circular(8.0), - child: Image.network( - columnReligiousCommunitiesRecord - .logoUrl, - width: 200.0, - height: 200.0, - fit: BoxFit.cover, + child: InkWell( + splashColor: Colors.transparent, + focusColor: Colors.transparent, + hoverColor: Colors.transparent, + highlightColor: Colors.transparent, + onTap: () async { + await launchURL( + columnReligiousCommunitiesRecord + .url); + }, + child: ClipRRect( + borderRadius: + BorderRadius.circular(8.0), + child: Image.network( + columnReligiousCommunitiesRecord + .logoUrl, + width: 200.0, + height: 200.0, + fit: BoxFit.cover, + ), ), ), ), @@ -322,16 +338,31 @@ class _ReligiousCommunityWidgetState extends State letterSpacing: 0.0, ), ), - Text( - columnReligiousCommunitiesRecord - .phoneNumber, - style: - FlutterFlowTheme.of(context) - .bodyMedium - .override( - fontFamily: 'Figtree', - letterSpacing: 0.0, - ), + InkWell( + splashColor: Colors.transparent, + focusColor: Colors.transparent, + hoverColor: Colors.transparent, + highlightColor: + Colors.transparent, + onTap: () async { + await launchUrl(Uri( + scheme: 'tel', + path: + columnReligiousCommunitiesRecord + .phoneNumber, + )); + }, + child: Text( + columnReligiousCommunitiesRecord + .phoneNumber, + style: FlutterFlowTheme.of( + context) + .bodyMedium + .override( + fontFamily: 'Figtree', + letterSpacing: 0.0, + ), + ), ), ], ), diff --git a/lib/pages/features/students_hand_book/students_hand_book_model.dart b/lib/pages/features/students_hand_book/students_hand_book_model.dart index 919668f..df1a35a 100644 --- a/lib/pages/features/students_hand_book/students_hand_book_model.dart +++ b/lib/pages/features/students_hand_book/students_hand_book_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_pdf_viewer.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'students_hand_book_widget.dart' show StudentsHandBookWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/students_hand_book/students_hand_book_widget.dart b/lib/pages/features/students_hand_book/students_hand_book_widget.dart index 968709c..01bd142 100644 --- a/lib/pages/features/students_hand_book/students_hand_book_widget.dart +++ b/lib/pages/features/students_hand_book/students_hand_book_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_pdf_viewer.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; @@ -40,7 +41,10 @@ class _StudentsHandBookWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, @@ -134,7 +138,7 @@ class _StudentsHandBookWidgetState extends State { FlutterFlowPdfViewer( assetPath: 'assets/pdfs/1730017179741.pdf', width: double.infinity, - height: MediaQuery.sizeOf(context).height * 0.95, + height: MediaQuery.sizeOf(context).height * 0.98, horizontalScroll: false, ), ], diff --git a/lib/pages/features/students_portal_web/students_portal_web_model.dart b/lib/pages/features/students_portal_web/students_portal_web_model.dart index ba613f2..37486a6 100644 --- a/lib/pages/features/students_portal_web/students_portal_web_model.dart +++ b/lib/pages/features/students_portal_web/students_portal_web_model.dart @@ -3,6 +3,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_web_view.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'students_portal_web_widget.dart' show StudentsPortalWebWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/features/students_portal_web/students_portal_web_widget.dart b/lib/pages/features/students_portal_web/students_portal_web_widget.dart index 7807bfc..26e1d57 100644 --- a/lib/pages/features/students_portal_web/students_portal_web_widget.dart +++ b/lib/pages/features/students_portal_web/students_portal_web_widget.dart @@ -3,6 +3,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_web_view.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; @@ -45,7 +46,10 @@ class _StudentsPortalWebWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, @@ -65,8 +69,8 @@ class _StudentsPortalWebWidgetState extends State { color: FlutterFlowTheme.of(context).primaryText, size: 32.0, ), - onPressed: () { - print('IconButton pressed ...'); + onPressed: () async { + context.safePop(); }, ), title: Text( diff --git a/lib/pages/features/virtual_identity/virtual_identity_model.dart b/lib/pages/features/virtual_identity/virtual_identity_model.dart index b153f57..304897f 100644 --- a/lib/pages/features/virtual_identity/virtual_identity_model.dart +++ b/lib/pages/features/virtual_identity/virtual_identity_model.dart @@ -5,6 +5,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/pages/features/components/delete_virtual_i_d/delete_virtual_i_d_widget.dart'; import '/pages/features/components/download_virtual_i_d/download_virtual_i_d_widget.dart'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'virtual_identity_widget.dart' show VirtualIdentityWidget; import 'package:barcode_widget/barcode_widget.dart'; diff --git a/lib/pages/features/virtual_identity/virtual_identity_widget.dart b/lib/pages/features/virtual_identity/virtual_identity_widget.dart index 5999f6f..741982a 100644 --- a/lib/pages/features/virtual_identity/virtual_identity_widget.dart +++ b/lib/pages/features/virtual_identity/virtual_identity_widget.dart @@ -5,6 +5,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/pages/features/components/delete_virtual_i_d/delete_virtual_i_d_widget.dart'; import '/pages/features/components/download_virtual_i_d/download_virtual_i_d_widget.dart'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import 'package:barcode_widget/barcode_widget.dart'; import 'package:flutter/material.dart'; @@ -57,7 +58,10 @@ class _VirtualIdentityWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, @@ -708,10 +712,14 @@ class _VirtualIdentityWidgetState extends State { context)), child: WebViewAware( child: GestureDetector( - onTap: () => - FocusScope.of( - dialogContext) - .unfocus(), + onTap: () { + FocusScope.of( + dialogContext) + .unfocus(); + FocusManager.instance + .primaryFocus + ?.unfocus(); + }, child: DownloadVirtualIDWidget(), ), @@ -769,9 +777,13 @@ class _VirtualIdentityWidgetState extends State { context)), child: WebViewAware( child: GestureDetector( - onTap: () => FocusScope.of( - dialogContext) - .unfocus(), + onTap: () { + FocusScope.of(dialogContext) + .unfocus(); + FocusManager + .instance.primaryFocus + ?.unfocus(); + }, child: DeleteVirtualIDWidget( vritualIDRef: columnMyVirtualIDRecord! diff --git a/lib/pages/home/home_model.dart b/lib/pages/home/home_model.dart index a2fd9a8..c0cbbce 100644 --- a/lib/pages/home/home_model.dart +++ b/lib/pages/home/home_model.dart @@ -10,6 +10,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import '/flutter_flow/custom_functions.dart' as functions; import 'home_widget.dart' show HomeWidget; diff --git a/lib/pages/home/home_widget.dart b/lib/pages/home/home_widget.dart index 33f45a8..cccbd5d 100644 --- a/lib/pages/home/home_widget.dart +++ b/lib/pages/home/home_widget.dart @@ -10,6 +10,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import '/flutter_flow/custom_functions.dart' as functions; import 'package:cloud_firestore/cloud_firestore.dart'; @@ -118,9 +119,9 @@ class _HomeWidgetState extends State with TickerProviderStateMixin { _model.getTaskNoList = await actions.countNotesItems( _model.myNotes!.map((e) => e.reference).toList().toList(), ); - _model.assignmentNo = _model.getTaskNoList!.first; - _model.testNo = _model.getTaskNoList![1]; - _model.otherNo = _model.getTaskNoList!.last; + _model.assignmentNo = _model.getTaskNoList!.firstOrNull!; + _model.testNo = (_model.getTaskNoList!.elementAtOrNull(1))!; + _model.otherNo = _model.getTaskNoList!.lastOrNull!; safeSetState(() {}); if (functions.stringToInteger( valueOrDefault(currentUserDocument?.buildNumber, '')) < @@ -326,7 +327,7 @@ class _HomeWidgetState extends State with TickerProviderStateMixin { Colors.transparent, onTap: () async { setDarkModeSetting( - context, ThemeMode.dark); + context, ThemeMode.light); if (animationsMap[ 'iconOnActionTriggerAnimation1'] != null) { diff --git a/lib/pages/main_chat/main_chat_model.dart b/lib/pages/main_chat/main_chat_model.dart index 0a5792a..c3ffcab 100644 --- a/lib/pages/main_chat/main_chat_model.dart +++ b/lib/pages/main_chat/main_chat_model.dart @@ -7,6 +7,7 @@ import '/flutter_flow/flutter_flow_icon_button.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'main_chat_widget.dart' show MainChatWidget; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/main_chat/main_chat_widget.dart b/lib/pages/main_chat/main_chat_widget.dart index 87f8cbc..f9de5de 100644 --- a/lib/pages/main_chat/main_chat_widget.dart +++ b/lib/pages/main_chat/main_chat_widget.dart @@ -7,6 +7,7 @@ import '/flutter_flow/flutter_flow_icon_button.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; @@ -45,7 +46,10 @@ class _MainChatWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).secondaryBackground, @@ -133,8 +137,11 @@ class _MainChatWidgetState extends State { .resolve(Directionality.of(context)), child: WebViewAware( child: GestureDetector( - onTap: () => FocusScope.of(dialogContext) - .unfocus(), + onTap: () { + FocusScope.of(dialogContext).unfocus(); + FocusManager.instance.primaryFocus + ?.unfocus(); + }, child: ActivateAccountWidget( user: currentUserReference, ), @@ -388,7 +395,7 @@ class _MainChatWidgetState extends State { e != currentUserReference) .toList() - .first), + .firstOrNull!), ), builder: (context, snapshot) { @@ -645,7 +652,7 @@ class _MainChatWidgetState extends State { e != currentUserReference) .toList() - .first), + .firstOrNull!), ), builder: (context, snapshot) { @@ -705,7 +712,7 @@ class _MainChatWidgetState extends State { e != currentUserReference) .toList() - .last), + .lastOrNull!), builder: (context, snapshot) { diff --git a/lib/pages/main_feed/main_feed_model.dart b/lib/pages/main_feed/main_feed_model.dart index 4c26c18..15d56f5 100644 --- a/lib/pages/main_feed/main_feed_model.dart +++ b/lib/pages/main_feed/main_feed_model.dart @@ -3,6 +3,7 @@ import '/backend/backend.dart'; import '/components/activate_account_widget.dart'; import '/components/create_modal/create_modal_widget.dart'; import '/components/empty_list_1/empty_list1_widget.dart'; +import '/components/post_loading_effect/post_loading_effect_widget.dart'; import '/components/web_components/post_modal_view/post_modal_view_widget.dart'; import '/components/web_components/side_nav/side_nav_widget.dart'; import '/components/web_components/story_modal_view/story_modal_view_widget.dart'; @@ -13,6 +14,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_video_player.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'main_feed_widget.dart' show MainFeedWidget; import 'package:auto_size_text/auto_size_text.dart'; diff --git a/lib/pages/main_feed/main_feed_widget.dart b/lib/pages/main_feed/main_feed_widget.dart index 74331bf..1e0fa96 100644 --- a/lib/pages/main_feed/main_feed_widget.dart +++ b/lib/pages/main_feed/main_feed_widget.dart @@ -3,6 +3,7 @@ import '/backend/backend.dart'; import '/components/activate_account_widget.dart'; import '/components/create_modal/create_modal_widget.dart'; import '/components/empty_list_1/empty_list1_widget.dart'; +import '/components/post_loading_effect/post_loading_effect_widget.dart'; import '/components/web_components/post_modal_view/post_modal_view_widget.dart'; import '/components/web_components/side_nav/side_nav_widget.dart'; import '/components/web_components/story_modal_view/story_modal_view_widget.dart'; @@ -13,6 +14,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_video_player.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'package:auto_size_text/auto_size_text.dart'; import 'package:cached_network_image/cached_network_image.dart'; @@ -48,18 +50,6 @@ class _MainFeedWidgetState extends State _model = createModel(context, () => MainFeedModel()); animationsMap.addAll({ - 'containerOnPageLoadAnimation': AnimationInfo( - trigger: AnimationTrigger.onPageLoad, - effectsBuilder: () => [ - ShimmerEffect( - curve: Curves.easeInOut, - delay: 0.0.ms, - duration: 3000.0.ms, - color: Color(0x80FFFFFF), - angle: 0.524, - ), - ], - ), 'iconOnActionTriggerAnimation': AnimationInfo( trigger: AnimationTrigger.onActionTrigger, applyInitialState: false, @@ -344,11 +334,15 @@ class _MainFeedWidgetState extends State child: Padding( padding: EdgeInsetsDirectional.fromSTEB( 0.0, 2.0, 0.0, 8.0), - child: StreamBuilder>( - stream: queryUserStoriesRecord( + child: FutureBuilder>( + future: queryUserStoriesRecordOnce( queryBuilder: (userStoriesRecord) => - userStoriesRecord.orderBy('storyPostedAt', - descending: true), + userStoriesRecord + .where( + 'expiredDate', + isGreaterThan: getCurrentTimestamp, + ) + .orderBy('expiredDate', descending: true), limit: 20, ), builder: (context, snapshot) { @@ -561,8 +555,8 @@ class _MainFeedWidgetState extends State if (!snapshot.hasData) { return Center( child: SizedBox( - width: 50.0, - height: 50.0, + width: 1.0, + height: 1.0, child: CircularProgressIndicator( valueColor: AlwaysStoppedAnimation( FlutterFlowTheme.of(context).primary, @@ -600,18 +594,9 @@ class _MainFeedWidgetState extends State builder: (context, snapshot) { // Customize what your widget looks like when it's loading. if (!snapshot.hasData) { - return Center( - child: SizedBox( - width: 50.0, - height: 50.0, - child: CircularProgressIndicator( - valueColor: - AlwaysStoppedAnimation( - FlutterFlowTheme.of(context) - .primary, - ), - ), - ), + return Container( + width: double.infinity, + child: PostLoadingEffectWidget(), ); } @@ -1166,7 +1151,10 @@ class _MainFeedWidgetState extends State 12.0), child: Text( socialFeedUserPostsRecord - .postDescription, + .postDescription + .maybeHandleOverflow( + maxChars: 200, + ), style: FlutterFlowTheme .of(context) .bodyMedium @@ -1188,8 +1176,7 @@ class _MainFeedWidgetState extends State ), ), ), - ).animateOnPageLoad(animationsMap[ - 'containerOnPageLoadAnimation']!); + ); }, ), ); diff --git a/lib/pages/main_profile/main_profile_model.dart b/lib/pages/main_profile/main_profile_model.dart index 3970af0..076b7a5 100644 --- a/lib/pages/main_profile/main_profile_model.dart +++ b/lib/pages/main_profile/main_profile_model.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_toggle_icon.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/updated_chat/empty_state_simple/empty_state_simple_widget.dart'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import '/flutter_flow/custom_functions.dart' as functions; import 'main_profile_widget.dart' show MainProfileWidget; diff --git a/lib/pages/main_profile/main_profile_widget.dart b/lib/pages/main_profile/main_profile_widget.dart index daedaf2..3be03a3 100644 --- a/lib/pages/main_profile/main_profile_widget.dart +++ b/lib/pages/main_profile/main_profile_widget.dart @@ -8,6 +8,7 @@ import '/flutter_flow/flutter_flow_toggle_icon.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/updated_chat/empty_state_simple/empty_state_simple_widget.dart'; +import 'dart:ui'; import '/custom_code/actions/index.dart' as actions; import '/flutter_flow/custom_functions.dart' as functions; import 'package:cached_network_image/cached_network_image.dart'; @@ -926,6 +927,7 @@ class _MainProfileWidgetState extends State socialFeedUserPostsRecord.postDescription, 'I\'m back with a super quick Instagram redesign just for the fan. Rounded corners and cute icons, what else do we need, haha.⁣ ', ), + maxLines: 4, style: FlutterFlowTheme.of(context).bodyMedium.override( fontFamily: 'Figtree', letterSpacing: 0.0, diff --git a/lib/pages/post_details_page/post_details_page_model.dart b/lib/pages/post_details_page/post_details_page_model.dart index f68c2d0..72bd98d 100644 --- a/lib/pages/post_details_page/post_details_page_model.dart +++ b/lib/pages/post_details_page/post_details_page_model.dart @@ -4,6 +4,7 @@ import '/components/web_components/side_nav/side_nav_widget.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'post_details_page_widget.dart' show PostDetailsPageWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/pages/post_details_page/post_details_page_widget.dart b/lib/pages/post_details_page/post_details_page_widget.dart index 29cfce4..587c167 100644 --- a/lib/pages/post_details_page/post_details_page_widget.dart +++ b/lib/pages/post_details_page/post_details_page_widget.dart @@ -4,6 +4,7 @@ import '/components/web_components/side_nav/side_nav_widget.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/pages/view_profile_page_other/view_profile_page_other_model.dart b/lib/pages/view_profile_page_other/view_profile_page_other_model.dart index 31d3fad..6c2e3ac 100644 --- a/lib/pages/view_profile_page_other/view_profile_page_other_model.dart +++ b/lib/pages/view_profile_page_other/view_profile_page_other_model.dart @@ -9,6 +9,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/updated_chat/empty_state_simple/empty_state_simple_widget.dart'; import 'dart:async'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'view_profile_page_other_widget.dart' show ViewProfilePageOtherWidget; import 'package:cached_network_image/cached_network_image.dart'; diff --git a/lib/pages/view_profile_page_other/view_profile_page_other_widget.dart b/lib/pages/view_profile_page_other/view_profile_page_other_widget.dart index 548af4d..e16f72b 100644 --- a/lib/pages/view_profile_page_other/view_profile_page_other_widget.dart +++ b/lib/pages/view_profile_page_other/view_profile_page_other_widget.dart @@ -9,6 +9,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/updated_chat/empty_state_simple/empty_state_simple_widget.dart'; import 'dart:async'; +import 'dart:ui'; import '/flutter_flow/custom_functions.dart' as functions; import 'package:cached_network_image/cached_network_image.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; diff --git a/lib/privacy/privacy_model.dart b/lib/privacy/privacy_model.dart index 4618b60..12c4385 100644 --- a/lib/privacy/privacy_model.dart +++ b/lib/privacy/privacy_model.dart @@ -1,6 +1,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'privacy_widget.dart' show PrivacyWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/privacy/privacy_widget.dart b/lib/privacy/privacy_widget.dart index 3256b79..c916c09 100644 --- a/lib/privacy/privacy_widget.dart +++ b/lib/privacy/privacy_widget.dart @@ -1,6 +1,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; @@ -37,7 +38,10 @@ class _PrivacyWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).primaryBackground, diff --git a/lib/updated_chat/chat_2_details/chat2_details_model.dart b/lib/updated_chat/chat_2_details/chat2_details_model.dart index 2061175..daec64c 100644 --- a/lib/updated_chat/chat_2_details/chat2_details_model.dart +++ b/lib/updated_chat/chat_2_details/chat2_details_model.dart @@ -7,6 +7,7 @@ import '/flutter_flow/flutter_flow_widgets.dart'; import '/updated_chat/chat_details_overlay/chat_details_overlay_widget.dart'; import '/updated_chat/chat_thread_component/chat_thread_component_widget.dart'; import 'dart:async'; +import 'dart:ui'; import 'chat2_details_widget.dart' show Chat2DetailsWidget; import 'package:auto_size_text/auto_size_text.dart'; import 'package:cached_network_image/cached_network_image.dart'; diff --git a/lib/updated_chat/chat_2_details/chat2_details_widget.dart b/lib/updated_chat/chat_2_details/chat2_details_widget.dart index 35ddaa4..ff947d9 100644 --- a/lib/updated_chat/chat_2_details/chat2_details_widget.dart +++ b/lib/updated_chat/chat_2_details/chat2_details_widget.dart @@ -7,6 +7,7 @@ import '/flutter_flow/flutter_flow_widgets.dart'; import '/updated_chat/chat_details_overlay/chat_details_overlay_widget.dart'; import '/updated_chat/chat_thread_component/chat_thread_component_widget.dart'; import 'dart:async'; +import 'dart:ui'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; @@ -69,7 +70,10 @@ class _Chat2DetailsWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).secondaryBackground, @@ -108,7 +112,7 @@ class _Chat2DetailsWidgetState extends State { future: UsersRecord.getDocumentOnce(widget!.chatRef!.users .where((e) => e != currentUserReference) .toList() - .first), + .firstOrNull!), builder: (context, snapshot) { // Customize what your widget looks like when it's loading. if (!snapshot.hasData) { @@ -240,7 +244,7 @@ class _Chat2DetailsWidgetState extends State { .where((e) => e != currentUserReference) .toList() - .last), + .lastOrNull!), builder: (context, snapshot) { // Customize what your widget looks like when it's loading. if (!snapshot.hasData) { @@ -415,7 +419,10 @@ class _Chat2DetailsWidgetState extends State { builder: (context) { return WebViewAware( child: GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Padding( padding: MediaQuery.viewInsetsOf(context), child: ChatDetailsOverlayWidget( diff --git a/lib/updated_chat/chat_2_invite_users/chat2_invite_users_model.dart b/lib/updated_chat/chat_2_invite_users/chat2_invite_users_model.dart index 83d1404..5df5eaf 100644 --- a/lib/updated_chat/chat_2_invite_users/chat2_invite_users_model.dart +++ b/lib/updated_chat/chat_2_invite_users/chat2_invite_users_model.dart @@ -5,6 +5,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/updated_chat/empty_state_simple/empty_state_simple_widget.dart'; +import 'dart:ui'; import '/flutter_flow/random_data_util.dart' as random_data; import 'chat2_invite_users_widget.dart' show Chat2InviteUsersWidget; import 'package:cached_network_image/cached_network_image.dart'; diff --git a/lib/updated_chat/chat_2_invite_users/chat2_invite_users_widget.dart b/lib/updated_chat/chat_2_invite_users/chat2_invite_users_widget.dart index a8cb352..27888c8 100644 --- a/lib/updated_chat/chat_2_invite_users/chat2_invite_users_widget.dart +++ b/lib/updated_chat/chat_2_invite_users/chat2_invite_users_widget.dart @@ -5,6 +5,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/updated_chat/empty_state_simple/empty_state_simple_widget.dart'; +import 'dart:ui'; import '/flutter_flow/random_data_util.dart' as random_data; import 'package:cached_network_image/cached_network_image.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; @@ -66,7 +67,10 @@ class _Chat2InviteUsersWidgetState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).secondaryBackground, @@ -585,7 +589,7 @@ class _Chat2InviteUsersWidgetState extends State { await chatsRecordReference.set({ ...createChatsRecordData( userA: currentUserReference, - userB: _model.friendsList[1], + userB: _model.friendsList.elementAtOrNull(1), lastMessage: '', lastMessageTime: getCurrentTimestamp, lastMessageSentBy: currentUserReference, @@ -602,7 +606,7 @@ class _Chat2InviteUsersWidgetState extends State { ChatsRecord.getDocumentFromData({ ...createChatsRecordData( userA: currentUserReference, - userB: _model.friendsList[1], + userB: _model.friendsList.elementAtOrNull(1), lastMessage: '', lastMessageTime: getCurrentTimestamp, lastMessageSentBy: currentUserReference, diff --git a/lib/updated_chat/chat_details_overlay/chat_details_overlay_model.dart b/lib/updated_chat/chat_details_overlay/chat_details_overlay_model.dart index 976128c..7a60d55 100644 --- a/lib/updated_chat/chat_details_overlay/chat_details_overlay_model.dart +++ b/lib/updated_chat/chat_details_overlay/chat_details_overlay_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/updated_chat/delete_dialog/delete_dialog_widget.dart'; import '/updated_chat/user_list_small/user_list_small_widget.dart'; +import 'dart:ui'; import 'chat_details_overlay_widget.dart' show ChatDetailsOverlayWidget; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/gestures.dart'; diff --git a/lib/updated_chat/chat_details_overlay/chat_details_overlay_widget.dart b/lib/updated_chat/chat_details_overlay/chat_details_overlay_widget.dart index 1477727..9930be3 100644 --- a/lib/updated_chat/chat_details_overlay/chat_details_overlay_widget.dart +++ b/lib/updated_chat/chat_details_overlay/chat_details_overlay_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import '/updated_chat/delete_dialog/delete_dialog_widget.dart'; import '/updated_chat/user_list_small/user_list_small_widget.dart'; +import 'dart:ui'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; diff --git a/lib/updated_chat/chat_thread/chat_thread_model.dart b/lib/updated_chat/chat_thread/chat_thread_model.dart index 65d668a..02792e4 100644 --- a/lib/updated_chat/chat_thread/chat_thread_model.dart +++ b/lib/updated_chat/chat_thread/chat_thread_model.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_media_display.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_video_player.dart'; +import 'dart:ui'; import '/flutter_flow/request_manager.dart'; import 'chat_thread_widget.dart' show ChatThreadWidget; diff --git a/lib/updated_chat/chat_thread/chat_thread_widget.dart b/lib/updated_chat/chat_thread/chat_thread_widget.dart index 0b47bae..adb2366 100644 --- a/lib/updated_chat/chat_thread/chat_thread_widget.dart +++ b/lib/updated_chat/chat_thread/chat_thread_widget.dart @@ -4,6 +4,7 @@ import '/flutter_flow/flutter_flow_media_display.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_video_player.dart'; +import 'dart:ui'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; diff --git a/lib/updated_chat/chat_thread_component/chat_thread_component_model.dart b/lib/updated_chat/chat_thread_component/chat_thread_component_model.dart index b5587f0..3d8e2a2 100644 --- a/lib/updated_chat/chat_thread_component/chat_thread_component_model.dart +++ b/lib/updated_chat/chat_thread_component/chat_thread_component_model.dart @@ -9,6 +9,7 @@ import '/flutter_flow/flutter_flow_video_player.dart'; import '/flutter_flow/upload_data.dart'; import '/updated_chat/chat_thread/chat_thread_widget.dart'; import '/updated_chat/empty_state_simple/empty_state_simple_widget.dart'; +import 'dart:ui'; import 'chat_thread_component_widget.dart' show ChatThreadComponentWidget; import 'package:cached_network_image/cached_network_image.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; diff --git a/lib/updated_chat/chat_thread_component/chat_thread_component_widget.dart b/lib/updated_chat/chat_thread_component/chat_thread_component_widget.dart index 26c07b1..ca56f36 100644 --- a/lib/updated_chat/chat_thread_component/chat_thread_component_widget.dart +++ b/lib/updated_chat/chat_thread_component/chat_thread_component_widget.dart @@ -9,6 +9,7 @@ import '/flutter_flow/flutter_flow_video_player.dart'; import '/flutter_flow/upload_data.dart'; import '/updated_chat/chat_thread/chat_thread_widget.dart'; import '/updated_chat/empty_state_simple/empty_state_simple_widget.dart'; +import 'dart:ui'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:collection/collection.dart'; diff --git a/lib/updated_chat/delete_dialog/delete_dialog_model.dart b/lib/updated_chat/delete_dialog/delete_dialog_model.dart index fe59b35..f805235 100644 --- a/lib/updated_chat/delete_dialog/delete_dialog_model.dart +++ b/lib/updated_chat/delete_dialog/delete_dialog_model.dart @@ -3,6 +3,7 @@ import '/flutter_flow/flutter_flow_animations.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import 'dart:math'; +import 'dart:ui'; import 'delete_dialog_widget.dart' show DeleteDialogWidget; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; diff --git a/lib/updated_chat/delete_dialog/delete_dialog_widget.dart b/lib/updated_chat/delete_dialog/delete_dialog_widget.dart index 09585b1..6986149 100644 --- a/lib/updated_chat/delete_dialog/delete_dialog_widget.dart +++ b/lib/updated_chat/delete_dialog/delete_dialog_widget.dart @@ -3,6 +3,7 @@ import '/flutter_flow/flutter_flow_animations.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import 'dart:math'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_animate/flutter_animate.dart'; diff --git a/lib/updated_chat/empty_state_simple/empty_state_simple_model.dart b/lib/updated_chat/empty_state_simple/empty_state_simple_model.dart index 2b8d112..fda1841 100644 --- a/lib/updated_chat/empty_state_simple/empty_state_simple_model.dart +++ b/lib/updated_chat/empty_state_simple/empty_state_simple_model.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'empty_state_simple_widget.dart' show EmptyStateSimpleWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/updated_chat/empty_state_simple/empty_state_simple_widget.dart b/lib/updated_chat/empty_state_simple/empty_state_simple_widget.dart index 562ba45..804f58f 100644 --- a/lib/updated_chat/empty_state_simple/empty_state_simple_widget.dart +++ b/lib/updated_chat/empty_state_simple/empty_state_simple_widget.dart @@ -1,5 +1,6 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/lib/updated_chat/image_details/image_details_model.dart b/lib/updated_chat/image_details/image_details_model.dart index 436d0c0..6cdca90 100644 --- a/lib/updated_chat/image_details/image_details_model.dart +++ b/lib/updated_chat/image_details/image_details_model.dart @@ -5,6 +5,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import 'image_details_widget.dart' show ImageDetailsWidget; import 'package:auto_size_text/auto_size_text.dart'; import 'package:cached_network_image/cached_network_image.dart'; diff --git a/lib/updated_chat/image_details/image_details_widget.dart b/lib/updated_chat/image_details/image_details_widget.dart index b153947..2666225 100644 --- a/lib/updated_chat/image_details/image_details_widget.dart +++ b/lib/updated_chat/image_details/image_details_widget.dart @@ -5,6 +5,7 @@ import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; import '/flutter_flow/flutter_flow_widgets.dart'; import 'dart:math'; +import 'dart:ui'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; @@ -110,7 +111,10 @@ class _ImageDetailsWidgetState extends State @override Widget build(BuildContext context) { return GestureDetector( - onTap: () => FocusScope.of(context).unfocus(), + onTap: () { + FocusScope.of(context).unfocus(); + FocusManager.instance.primaryFocus?.unfocus(); + }, child: Scaffold( key: scaffoldKey, backgroundColor: FlutterFlowTheme.of(context).secondaryBackground, diff --git a/lib/updated_chat/user_list_small/user_list_small_model.dart b/lib/updated_chat/user_list_small/user_list_small_model.dart index 0968507..562b5f4 100644 --- a/lib/updated_chat/user_list_small/user_list_small_model.dart +++ b/lib/updated_chat/user_list_small/user_list_small_model.dart @@ -2,6 +2,7 @@ import '/auth/firebase_auth/auth_util.dart'; import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'user_list_small_widget.dart' show UserListSmallWidget; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; diff --git a/lib/updated_chat/user_list_small/user_list_small_widget.dart b/lib/updated_chat/user_list_small/user_list_small_widget.dart index bddb118..36b39ca 100644 --- a/lib/updated_chat/user_list_small/user_list_small_widget.dart +++ b/lib/updated_chat/user_list_small/user_list_small_widget.dart @@ -2,6 +2,7 @@ import '/auth/firebase_auth/auth_util.dart'; import '/backend/backend.dart'; import '/flutter_flow/flutter_flow_theme.dart'; import '/flutter_flow/flutter_flow_util.dart'; +import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; diff --git a/pubspec.lock b/pubspec.lock deleted file mode 100644 index 415f74a..0000000 --- a/pubspec.lock +++ /dev/null @@ -1,1646 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - _flutterfire_internals: - dependency: transitive - description: - name: _flutterfire_internals - sha256: "5534e701a2c505fed1f0799e652dd6ae23bd4d2c4cf797220e5ced5764a7c1c2" - url: "https://pub.dev" - source: hosted - version: "1.3.44" - aligned_dialog: - dependency: "direct main" - description: - name: aligned_dialog - sha256: c6ce4f82a5ab35dde2c48caa436eab4da9d6a4238802f67312c878394caf055d - url: "https://pub.dev" - source: hosted - version: "0.0.6" - ansicolor: - dependency: transitive - description: - name: ansicolor - sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f" - url: "https://pub.dev" - source: hosted - version: "2.0.3" - archive: - dependency: transitive - description: - name: archive - sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d - url: "https://pub.dev" - source: hosted - version: "3.6.1" - args: - dependency: transitive - description: - name: args - sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 - url: "https://pub.dev" - source: hosted - version: "2.6.0" - async: - dependency: transitive - description: - name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" - url: "https://pub.dev" - source: hosted - version: "2.11.0" - auto_size_text: - dependency: "direct main" - description: - name: auto_size_text - sha256: "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - barcode: - dependency: transitive - description: - name: barcode - sha256: ab180ce22c6555d77d45f0178a523669db67f95856e3378259ef2ffeb43e6003 - url: "https://pub.dev" - source: hosted - version: "2.2.8" - barcode_widget: - dependency: "direct main" - description: - name: barcode_widget - sha256: ea0c0578b5db3ca3a583d80e05eb47bfb70419e3a23b920d93ae7968c45c20ce - url: "https://pub.dev" - source: hosted - version: "2.0.3" - blurhash_dart: - dependency: "direct main" - description: - name: blurhash_dart - sha256: "43955b6c2e30a7d440028d1af0fa185852f3534b795cc6eb81fbf397b464409f" - url: "https://pub.dev" - source: hosted - version: "1.2.1" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - cached_network_image: - dependency: "direct main" - description: - name: cached_network_image - sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916" - url: "https://pub.dev" - source: hosted - version: "3.4.1" - cached_network_image_platform_interface: - dependency: "direct main" - description: - name: cached_network_image_platform_interface - sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829" - url: "https://pub.dev" - source: hosted - version: "4.1.1" - cached_network_image_web: - dependency: "direct main" - description: - name: cached_network_image_web - sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - characters: - dependency: transitive - description: - name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" - url: "https://pub.dev" - source: hosted - version: "1.3.0" - checked_yaml: - dependency: transitive - description: - name: checked_yaml - sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff - url: "https://pub.dev" - source: hosted - version: "2.0.3" - chewie: - dependency: "direct main" - description: - name: chewie - sha256: "335df378c025588aef400c704bd71f0daea479d4cd57c471c88c056c1144e7cd" - url: "https://pub.dev" - source: hosted - version: "1.8.5" - cli_util: - dependency: transitive - description: - name: cli_util - sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c - url: "https://pub.dev" - source: hosted - version: "0.4.2" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - cloud_firestore: - dependency: "direct main" - description: - name: cloud_firestore - sha256: bdc7607e9169ee3ce736bbbe6a81c2a6cb15c41379346b74f77f8e641211a17f - url: "https://pub.dev" - source: hosted - version: "5.4.4" - cloud_firestore_platform_interface: - dependency: "direct main" - description: - name: cloud_firestore_platform_interface - sha256: "884fa34c6be2d9c7c1f4af86f90f36c0a3b3afef585a12b350a5d15368e7ec7a" - url: "https://pub.dev" - source: hosted - version: "6.4.3" - cloud_firestore_web: - dependency: "direct main" - description: - name: cloud_firestore_web - sha256: "6e621bbcc999f32db0bc6bfcb18d9991617ec20f8d6bf51b6a1571f5c324fafd" - url: "https://pub.dev" - source: hosted - version: "4.3.2" - collection: - dependency: "direct main" - description: - name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a - url: "https://pub.dev" - source: hosted - version: "1.18.0" - cross_file: - dependency: transitive - description: - name: cross_file - sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670" - url: "https://pub.dev" - source: hosted - version: "0.3.4+2" - crypto: - dependency: transitive - description: - name: crypto - sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" - url: "https://pub.dev" - source: hosted - version: "3.0.6" - csslib: - dependency: "direct main" - description: - name: csslib - sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" - url: "https://pub.dev" - source: hosted - version: "0.17.3" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 - url: "https://pub.dev" - source: hosted - version: "1.0.8" - dbus: - dependency: transitive - description: - name: dbus - sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac" - url: "https://pub.dev" - source: hosted - version: "0.7.10" - device_info_plus: - dependency: "direct main" - description: - name: device_info_plus - sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 - url: "https://pub.dev" - source: hosted - version: "10.1.2" - device_info_plus_platform_interface: - dependency: "direct overridden" - description: - name: device_info_plus_platform_interface - sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba" - url: "https://pub.dev" - source: hosted - version: "7.0.1" - dropdown_button2: - dependency: "direct main" - description: - name: dropdown_button2 - sha256: b0fe8d49a030315e9eef6c7ac84ca964250155a6224d491c1365061bc974a9e1 - url: "https://pub.dev" - source: hosted - version: "2.3.9" - easy_debounce: - dependency: "direct main" - description: - name: easy_debounce - sha256: "476ea3a9062023be76d9d3f48188af75137ad0b57bc250a0fb7adcc471923f51" - url: "https://pub.dev" - source: hosted - version: "2.0.1" - equatable: - dependency: "direct main" - description: - name: equatable - sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2 - url: "https://pub.dev" - source: hosted - version: "2.0.5" - expandable: - dependency: "direct main" - description: - name: expandable - sha256: "9604d612d4d1146dafa96c6d8eec9c2ff0994658d6d09fed720ab788c7f5afc2" - url: "https://pub.dev" - source: hosted - version: "5.0.1" - extension: - dependency: transitive - description: - name: extension - sha256: be3a6b7f8adad2f6e2e8c63c895d19811fcf203e23466c6296267941d0ff4f24 - url: "https://pub.dev" - source: hosted - version: "0.6.0" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - ffi: - dependency: transitive - description: - name: ffi - sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" - url: "https://pub.dev" - source: hosted - version: "2.1.3" - file: - dependency: transitive - description: - name: file - sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" - url: "https://pub.dev" - source: hosted - version: "7.0.0" - file_picker: - dependency: "direct main" - description: - name: file_picker - sha256: "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12" - url: "https://pub.dev" - source: hosted - version: "8.1.2" - file_selector_linux: - dependency: transitive - description: - name: file_selector_linux - sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33" - url: "https://pub.dev" - source: hosted - version: "0.9.3+2" - file_selector_macos: - dependency: transitive - description: - name: file_selector_macos - sha256: "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc" - url: "https://pub.dev" - source: hosted - version: "0.9.4+2" - file_selector_platform_interface: - dependency: transitive - description: - name: file_selector_platform_interface - sha256: a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b - url: "https://pub.dev" - source: hosted - version: "2.6.2" - file_selector_windows: - dependency: transitive - description: - name: file_selector_windows - sha256: "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4" - url: "https://pub.dev" - source: hosted - version: "0.9.3+3" - firebase_auth: - dependency: "direct main" - description: - name: firebase_auth - sha256: d453acec0d958ba0e25d41a9901b32cb77d1535766903dea7a61b2788c304596 - url: "https://pub.dev" - source: hosted - version: "5.3.1" - firebase_auth_platform_interface: - dependency: "direct main" - description: - name: firebase_auth_platform_interface - sha256: "78966c2ef774f5bf2a8381a307222867e9ece3509110500f7a138c115926aa65" - url: "https://pub.dev" - source: hosted - version: "7.4.7" - firebase_auth_web: - dependency: "direct main" - description: - name: firebase_auth_web - sha256: "77ad3b252badedd3f08dfa21a4c7fe244be96c6da3a4067f253b13ea5d32424c" - url: "https://pub.dev" - source: hosted - version: "5.13.2" - firebase_core: - dependency: "direct main" - description: - name: firebase_core - sha256: "51dfe2fbf3a984787a2e7b8592f2f05c986bfedd6fdacea3f9e0a7beb334de96" - url: "https://pub.dev" - source: hosted - version: "3.6.0" - firebase_core_platform_interface: - dependency: "direct main" - description: - name: firebase_core_platform_interface - sha256: e30da58198a6d4b49d5bce4e852f985c32cb10db329ebef9473db2b9f09ce810 - url: "https://pub.dev" - source: hosted - version: "5.3.0" - firebase_core_web: - dependency: "direct main" - description: - name: firebase_core_web - sha256: f967a7138f5d2ffb1ce15950e2a382924239eaa521150a8f144af34e68b3b3e5 - url: "https://pub.dev" - source: hosted - version: "2.18.1" - firebase_performance: - dependency: "direct main" - description: - name: firebase_performance - sha256: "0df8208afad64aa1d774bd267033312284bd73e68210caf6936dc1f8a8fa0878" - url: "https://pub.dev" - source: hosted - version: "0.10.0+8" - firebase_performance_platform_interface: - dependency: "direct main" - description: - name: firebase_performance_platform_interface - sha256: "97cc3fcda0a835142ff2e93b19dd72904d666a576e196f12cdaf492921e6ea44" - url: "https://pub.dev" - source: hosted - version: "0.1.4+44" - firebase_performance_web: - dependency: "direct main" - description: - name: firebase_performance_web - sha256: "322a4ae99cb952cdfd788399f52421dd6ecd713723ac7e5e6bb7856bb28ef270" - url: "https://pub.dev" - source: hosted - version: "0.1.7+2" - firebase_storage: - dependency: "direct main" - description: - name: firebase_storage - sha256: "8a8a21f3a359129a1257e2e77ece1de9678f40e43876635b3d411388ee388729" - url: "https://pub.dev" - source: hosted - version: "12.3.2" - firebase_storage_platform_interface: - dependency: "direct main" - description: - name: firebase_storage_platform_interface - sha256: "462621bbdb5ab496518aa0f4785cb6db87763d5f1063aa228e1f65562937af1d" - url: "https://pub.dev" - source: hosted - version: "5.1.31" - firebase_storage_web: - dependency: "direct main" - description: - name: firebase_storage_web - sha256: "40c52d5585ce63659b4b698fee0d47412ce499392ae3edf69c8e6141c22daf9a" - url: "https://pub.dev" - source: hosted - version: "3.10.2" - fixnum: - dependency: transitive - description: - name: fixnum - sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be - url: "https://pub.dev" - source: hosted - version: "1.1.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_animate: - dependency: "direct main" - description: - name: flutter_animate - sha256: "7c8a6594a9252dad30cc2ef16e33270b6248c4dedc3b3d06c86c4f3f4dc05ae5" - url: "https://pub.dev" - source: hosted - version: "4.5.0" - flutter_barcode_scanner: - dependency: transitive - description: - name: flutter_barcode_scanner - sha256: a4ba37daf9933f451a5e812c753ddd045d6354e4a3280342d895b07fecaab3fa - url: "https://pub.dev" - source: hosted - version: "2.0.0" - flutter_blurhash: - dependency: "direct main" - description: - name: flutter_blurhash - sha256: "5e67678e479ac639069d7af1e133f4a4702311491188ff3e0227486430db0c06" - url: "https://pub.dev" - source: hosted - version: "0.8.2" - flutter_cache_manager: - dependency: "direct main" - description: - name: flutter_cache_manager - sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386" - url: "https://pub.dev" - source: hosted - version: "3.4.1" - flutter_driver: - dependency: transitive - description: flutter - source: sdk - version: "0.0.0" - flutter_keyboard_visibility: - dependency: "direct main" - description: - name: flutter_keyboard_visibility - sha256: "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8" - url: "https://pub.dev" - source: hosted - version: "6.0.0" - flutter_keyboard_visibility_linux: - dependency: "direct main" - description: - name: flutter_keyboard_visibility_linux - sha256: "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - flutter_keyboard_visibility_macos: - dependency: "direct main" - description: - name: flutter_keyboard_visibility_macos - sha256: c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086 - url: "https://pub.dev" - source: hosted - version: "1.0.0" - flutter_keyboard_visibility_platform_interface: - dependency: "direct main" - description: - name: flutter_keyboard_visibility_platform_interface - sha256: e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4 - url: "https://pub.dev" - source: hosted - version: "2.0.0" - flutter_keyboard_visibility_web: - dependency: "direct main" - description: - name: flutter_keyboard_visibility_web - sha256: d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1 - url: "https://pub.dev" - source: hosted - version: "2.0.0" - flutter_keyboard_visibility_windows: - dependency: "direct main" - description: - name: flutter_keyboard_visibility_windows - sha256: fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73 - url: "https://pub.dev" - source: hosted - version: "1.0.0" - flutter_launcher_icons: - dependency: "direct dev" - description: - name: flutter_launcher_icons - sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" - url: "https://pub.dev" - source: hosted - version: "0.13.1" - flutter_lints: - dependency: "direct dev" - description: - name: flutter_lints - sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c" - url: "https://pub.dev" - source: hosted - version: "4.0.0" - flutter_localizations: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_native_splash: - dependency: "direct main" - description: - name: flutter_native_splash - sha256: aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840 - url: "https://pub.dev" - source: hosted - version: "2.4.1" - flutter_plugin_android_lifecycle: - dependency: "direct main" - description: - name: flutter_plugin_android_lifecycle - sha256: c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e - url: "https://pub.dev" - source: hosted - version: "2.0.20" - flutter_shaders: - dependency: transitive - description: - name: flutter_shaders - sha256: "34794acadd8275d971e02df03afee3dee0f98dbfb8c4837082ad0034f612a3e2" - url: "https://pub.dev" - source: hosted - version: "0.1.3" - flutter_staggered_grid_view: - dependency: transitive - description: - name: flutter_staggered_grid_view - sha256: "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395" - url: "https://pub.dev" - source: hosted - version: "0.7.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - flutter_web_plugins: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_windowmanager: - dependency: "direct main" - description: - name: flutter_windowmanager - sha256: b4d0bc06f6777952b729c0cdb7ce9ad1ecabd8b8b1cb0acb57a36621457dab1b - url: "https://pub.dev" - source: hosted - version: "0.2.0" - font_awesome_flutter: - dependency: "direct main" - description: - name: font_awesome_flutter - sha256: "275ff26905134bcb59417cf60ad979136f1f8257f2f449914b2c3e05bbb4cd6f" - url: "https://pub.dev" - source: hosted - version: "10.7.0" - from_css_color: - dependency: "direct main" - description: - name: from_css_color - sha256: "5e4d1795c8d10af94e51dd97636b2a29170a132be1aceba103e9866028d20823" - url: "https://pub.dev" - source: hosted - version: "2.0.0" - fuchsia_remote_debug_protocol: - dependency: transitive - description: flutter - source: sdk - version: "0.0.0" - go_router: - dependency: "direct main" - description: - name: go_router - sha256: c5fa45fa502ee880839e3b2152d987c44abae26d064a2376d4aad434cf0f7b15 - url: "https://pub.dev" - source: hosted - version: "12.1.3" - google_fonts: - dependency: "direct main" - description: - name: google_fonts - sha256: f0b8d115a13ecf827013ec9fc883390ccc0e87a96ed5347a3114cac177ef18e8 - url: "https://pub.dev" - source: hosted - version: "6.1.0" - google_identity_services_web: - dependency: transitive - description: - name: google_identity_services_web - sha256: "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9" - url: "https://pub.dev" - source: hosted - version: "0.3.3" - google_sign_in: - dependency: "direct main" - description: - name: google_sign_in - sha256: "0b8787cb9c1a68ad398e8010e8c8766bfa33556d2ab97c439fb4137756d7308f" - url: "https://pub.dev" - source: hosted - version: "6.2.1" - google_sign_in_android: - dependency: "direct main" - description: - name: google_sign_in_android - sha256: "0608de03fc541ece4f91ba3e01a68b17cce7a6cf42bd59e40bbe5c55cc3a49d8" - url: "https://pub.dev" - source: hosted - version: "6.1.30" - google_sign_in_ios: - dependency: "direct main" - description: - name: google_sign_in_ios - sha256: "4898410f55440049e1ba8f15411612d9f89299d89c61cd9baf7e02d56ff81ac7" - url: "https://pub.dev" - source: hosted - version: "5.7.7" - google_sign_in_platform_interface: - dependency: "direct main" - description: - name: google_sign_in_platform_interface - sha256: "1f6e5787d7a120cc0359ddf315c92309069171306242e181c09472d1b00a2971" - url: "https://pub.dev" - source: hosted - version: "2.4.5" - google_sign_in_web: - dependency: "direct main" - description: - name: google_sign_in_web - sha256: "042805a21127a85b0dc46bba98a37926f17d2439720e8a459d27045d8ef68055" - url: "https://pub.dev" - source: hosted - version: "0.12.4+2" - html: - dependency: "direct main" - description: - name: html - sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" - url: "https://pub.dev" - source: hosted - version: "0.15.4" - http: - dependency: "direct main" - description: - name: http - sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 - url: "https://pub.dev" - source: hosted - version: "1.2.2" - http_parser: - dependency: transitive - description: - name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" - url: "https://pub.dev" - source: hosted - version: "4.0.2" - image: - dependency: "direct main" - description: - name: image - sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" - url: "https://pub.dev" - source: hosted - version: "4.2.0" - image_picker: - dependency: "direct main" - description: - name: image_picker - sha256: "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a" - url: "https://pub.dev" - source: hosted - version: "1.1.2" - image_picker_android: - dependency: "direct main" - description: - name: image_picker_android - sha256: c0a6763d50b354793d0192afd0a12560b823147d3ded7c6b77daf658fa05cc85 - url: "https://pub.dev" - source: hosted - version: "0.8.12+13" - image_picker_for_web: - dependency: "direct main" - description: - name: image_picker_for_web - sha256: "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50" - url: "https://pub.dev" - source: hosted - version: "3.0.5" - image_picker_ios: - dependency: "direct main" - description: - name: image_picker_ios - sha256: "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447" - url: "https://pub.dev" - source: hosted - version: "0.8.12" - image_picker_linux: - dependency: "direct main" - description: - name: image_picker_linux - sha256: "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa" - url: "https://pub.dev" - source: hosted - version: "0.2.1+1" - image_picker_macos: - dependency: "direct main" - description: - name: image_picker_macos - sha256: "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62" - url: "https://pub.dev" - source: hosted - version: "0.2.1+1" - image_picker_platform_interface: - dependency: "direct main" - description: - name: image_picker_platform_interface - sha256: "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80" - url: "https://pub.dev" - source: hosted - version: "2.10.0" - image_picker_windows: - dependency: "direct main" - description: - name: image_picker_windows - sha256: "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb" - url: "https://pub.dev" - source: hosted - version: "0.2.1+1" - infinite_scroll_pagination: - dependency: "direct main" - description: - name: infinite_scroll_pagination - sha256: b68bce20752fcf36c7739e60de4175494f74e99e9a69b4dd2fe3a1dd07a7f16a - url: "https://pub.dev" - source: hosted - version: "4.0.0" - integration_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - internet_file: - dependency: "direct main" - description: - name: internet_file - sha256: c3e6aa0c1cc6c08e701bb91019a7784fece1f64e18464f53df1200caa7598b68 - url: "https://pub.dev" - source: hosted - version: "1.2.0" - intl: - dependency: "direct main" - description: - name: intl - sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf - url: "https://pub.dev" - source: hosted - version: "0.19.0" - iregexp: - dependency: transitive - description: - name: iregexp - sha256: "143859dcaeecf6f683102786762d70a47ef8441a0d2287a158172d32d38799cf" - url: "https://pub.dev" - source: hosted - version: "0.1.2" - json_annotation: - dependency: transitive - description: - name: json_annotation - sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" - url: "https://pub.dev" - source: hosted - version: "4.9.0" - json_path: - dependency: "direct main" - description: - name: json_path - sha256: dc25b4e2297a6bd39fb52b7d122a7787b7dab751fb278d315b54706b98bb76db - url: "https://pub.dev" - source: hosted - version: "0.7.2" - leak_tracker: - dependency: transitive - description: - name: leak_tracker - sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" - url: "https://pub.dev" - source: hosted - version: "10.0.5" - leak_tracker_flutter_testing: - dependency: transitive - description: - name: leak_tracker_flutter_testing - sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" - url: "https://pub.dev" - source: hosted - version: "3.0.5" - leak_tracker_testing: - dependency: transitive - description: - name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" - url: "https://pub.dev" - source: hosted - version: "3.0.1" - lints: - dependency: "direct dev" - description: - name: lints - sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" - url: "https://pub.dev" - source: hosted - version: "4.0.0" - logging: - dependency: transitive - description: - name: logging - sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 - url: "https://pub.dev" - source: hosted - version: "1.3.0" - lottie: - dependency: "direct main" - description: - name: lottie - sha256: a93542cc2d60a7057255405f62252533f8e8956e7e06754955669fd32fb4b216 - url: "https://pub.dev" - source: hosted - version: "2.7.0" - map_launcher: - dependency: "direct main" - description: - name: map_launcher - sha256: "7436d6ef9ae57ff15beafcedafe0a8f0604006cbecd2d26024c4cfb0158c2b9a" - url: "https://pub.dev" - source: hosted - version: "3.5.0" - mask_text_input_formatter: - dependency: "direct main" - description: - name: mask_text_input_formatter - sha256: "978c58ec721c25621ceb468e633f4eef64b64d45424ac4540e0565d4f7c800cd" - url: "https://pub.dev" - source: hosted - version: "2.9.0" - matcher: - dependency: transitive - description: - name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb - url: "https://pub.dev" - source: hosted - version: "0.12.16+1" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec - url: "https://pub.dev" - source: hosted - version: "0.11.1" - maybe_just_nothing: - dependency: transitive - description: - name: maybe_just_nothing - sha256: "0c06326e26d08f6ed43247404376366dc4d756cef23a4f1db765f546224c35e0" - url: "https://pub.dev" - source: hosted - version: "0.5.3" - meta: - dependency: transitive - description: - name: meta - sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 - url: "https://pub.dev" - source: hosted - version: "1.15.0" - mime: - dependency: transitive - description: - name: mime - sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a" - url: "https://pub.dev" - source: hosted - version: "1.0.6" - mime_type: - dependency: "direct main" - description: - name: mime_type - sha256: "2ad6e67d3d2de9ac0f8ef5352d998fd103cb21351ae8c02fb0c78b079b37d275" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - nested: - dependency: transitive - description: - name: nested - sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - nfc_manager: - dependency: "direct main" - description: - name: nfc_manager - sha256: f5be75e90f8f2bff3ee49fbd7ef65bdd4a86ee679c2412e71ab2846a8cff8c59 - url: "https://pub.dev" - source: hosted - version: "3.5.0" - octo_image: - dependency: "direct main" - description: - name: octo_image - sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd" - url: "https://pub.dev" - source: hosted - version: "2.1.0" - package_info_plus: - dependency: "direct main" - description: - name: package_info_plus - sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce - url: "https://pub.dev" - source: hosted - version: "8.1.1" - package_info_plus_platform_interface: - dependency: transitive - description: - name: package_info_plus_platform_interface - sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66 - url: "https://pub.dev" - source: hosted - version: "3.0.1" - page_transition: - dependency: "direct main" - description: - name: page_transition - sha256: dee976b1f23de9bbef5cd512fe567e9f6278caee11f5eaca9a2115c19dc49ef6 - url: "https://pub.dev" - source: hosted - version: "2.1.0" - path: - dependency: transitive - description: - name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" - url: "https://pub.dev" - source: hosted - version: "1.9.0" - path_provider: - dependency: "direct main" - description: - name: path_provider - sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378 - url: "https://pub.dev" - source: hosted - version: "2.1.4" - path_provider_android: - dependency: "direct main" - description: - name: path_provider_android - sha256: "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7" - url: "https://pub.dev" - source: hosted - version: "2.2.10" - path_provider_foundation: - dependency: "direct main" - description: - name: path_provider_foundation - sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16 - url: "https://pub.dev" - source: hosted - version: "2.4.0" - path_provider_linux: - dependency: "direct main" - description: - name: path_provider_linux - sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 - url: "https://pub.dev" - source: hosted - version: "2.2.1" - path_provider_platform_interface: - dependency: "direct main" - description: - name: path_provider_platform_interface - sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" - url: "https://pub.dev" - source: hosted - version: "2.1.2" - path_provider_windows: - dependency: "direct main" - description: - name: path_provider_windows - sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 - url: "https://pub.dev" - source: hosted - version: "2.3.0" - pdfx: - dependency: "direct main" - description: - name: pdfx - sha256: cbbd7bf54d6f37524df85d06a816fa095d124cd32d42909effddc0027f9db10b - url: "https://pub.dev" - source: hosted - version: "2.8.0" - permission_handler: - dependency: transitive - description: - name: permission_handler - sha256: "18bf33f7fefbd812f37e72091a15575e72d5318854877e0e4035a24ac1113ecb" - url: "https://pub.dev" - source: hosted - version: "11.3.1" - permission_handler_android: - dependency: transitive - description: - name: permission_handler_android - sha256: "71bbecfee799e65aff7c744761a57e817e73b738fedf62ab7afd5593da21f9f1" - url: "https://pub.dev" - source: hosted - version: "12.0.13" - permission_handler_apple: - dependency: transitive - description: - name: permission_handler_apple - sha256: e6f6d73b12438ef13e648c4ae56bd106ec60d17e90a59c4545db6781229082a0 - url: "https://pub.dev" - source: hosted - version: "9.4.5" - permission_handler_html: - dependency: transitive - description: - name: permission_handler_html - sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24" - url: "https://pub.dev" - source: hosted - version: "0.1.3+5" - permission_handler_platform_interface: - dependency: transitive - description: - name: permission_handler_platform_interface - sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9 - url: "https://pub.dev" - source: hosted - version: "4.2.3" - permission_handler_windows: - dependency: transitive - description: - name: permission_handler_windows - sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" - url: "https://pub.dev" - source: hosted - version: "0.2.1" - petitparser: - dependency: transitive - description: - name: petitparser - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 - url: "https://pub.dev" - source: hosted - version: "6.0.2" - photo_view: - dependency: "direct main" - description: - name: photo_view - sha256: "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e" - url: "https://pub.dev" - source: hosted - version: "0.15.0" - platform: - dependency: transitive - description: - name: platform - sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65" - url: "https://pub.dev" - source: hosted - version: "3.1.5" - plugin_platform_interface: - dependency: "direct main" - description: - name: plugin_platform_interface - sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" - url: "https://pub.dev" - source: hosted - version: "2.1.8" - process: - dependency: transitive - description: - name: process - sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" - url: "https://pub.dev" - source: hosted - version: "5.0.2" - provider: - dependency: "direct main" - description: - name: provider - sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c - url: "https://pub.dev" - source: hosted - version: "6.1.2" - qr: - dependency: transitive - description: - name: qr - sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445" - url: "https://pub.dev" - source: hosted - version: "3.0.2" - rfc_6901: - dependency: transitive - description: - name: rfc_6901 - sha256: df1bbfa3d023009598f19636d6114c6ac1e0b7bb7bf6a260f0e6e6ce91416820 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - rxdart: - dependency: "direct main" - description: - name: rxdart - sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" - url: "https://pub.dev" - source: hosted - version: "0.27.7" - shared_preferences: - dependency: "direct main" - description: - name: shared_preferences - sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051" - url: "https://pub.dev" - source: hosted - version: "2.3.2" - shared_preferences_android: - dependency: "direct main" - description: - name: shared_preferences_android - sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e" - url: "https://pub.dev" - source: hosted - version: "2.3.2" - shared_preferences_foundation: - dependency: "direct main" - description: - name: shared_preferences_foundation - sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f - url: "https://pub.dev" - source: hosted - version: "2.5.2" - shared_preferences_linux: - dependency: "direct main" - description: - name: shared_preferences_linux - sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" - url: "https://pub.dev" - source: hosted - version: "2.4.1" - shared_preferences_platform_interface: - dependency: "direct main" - description: - name: shared_preferences_platform_interface - sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80" - url: "https://pub.dev" - source: hosted - version: "2.4.1" - shared_preferences_web: - dependency: "direct main" - description: - name: shared_preferences_web - sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e - url: "https://pub.dev" - source: hosted - version: "2.4.2" - shared_preferences_windows: - dependency: "direct main" - description: - name: shared_preferences_windows - sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" - url: "https://pub.dev" - source: hosted - version: "2.4.1" - sign_in_with_apple: - dependency: "direct main" - description: - name: sign_in_with_apple - sha256: "3c9dc9dcd5c42a17c6d4b912556198e8bd8e731ab67ac30f4a655974f95e7260" - url: "https://pub.dev" - source: hosted - version: "6.1.2" - sign_in_with_apple_platform_interface: - dependency: "direct main" - description: - name: sign_in_with_apple_platform_interface - sha256: c2ef2ce6273fce0c61acd7e9ff5be7181e33d7aa2b66508b39418b786cca2119 - url: "https://pub.dev" - source: hosted - version: "1.1.0" - sign_in_with_apple_web: - dependency: "direct main" - description: - name: sign_in_with_apple_web - sha256: c009e9beeb6c376e86aaa154fcc8b4e075d4bad90c56286b9668a51cdb6129ea - url: "https://pub.dev" - source: hosted - version: "2.1.0" - simple_barcode_scanner: - dependency: "direct main" - description: - name: simple_barcode_scanner - sha256: "52b30082ebd6fab1e6314cb9bfc1aca5372890616dcb89d0e254edf7b7ef4951" - url: "https://pub.dev" - source: hosted - version: "0.1.2" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - sliver_tools: - dependency: transitive - description: - name: sliver_tools - sha256: eae28220badfb9d0559207badcbbc9ad5331aac829a88cb0964d330d2a4636a6 - url: "https://pub.dev" - source: hosted - version: "0.2.12" - smooth_page_indicator: - dependency: "direct main" - description: - name: smooth_page_indicator - sha256: "725bc638d5e79df0c84658e1291449996943f93bacbc2cec49963dbbab48d8ae" - url: "https://pub.dev" - source: hosted - version: "1.1.0" - source_span: - dependency: transitive - description: - name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" - url: "https://pub.dev" - source: hosted - version: "1.10.0" - sprintf: - dependency: transitive - description: - name: sprintf - sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" - url: "https://pub.dev" - source: hosted - version: "7.0.0" - sqflite: - dependency: "direct main" - description: - name: sqflite - sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d - url: "https://pub.dev" - source: hosted - version: "2.3.3+1" - sqflite_common: - dependency: "direct main" - description: - name: sqflite_common - sha256: "4058172e418eb7e7f2058dcb7657d451a8fc264afa0dea4dbd0f304a57131611" - url: "https://pub.dev" - source: hosted - version: "2.5.4+3" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" - url: "https://pub.dev" - source: hosted - version: "1.11.1" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 - url: "https://pub.dev" - source: hosted - version: "2.1.2" - stream_transform: - dependency: "direct main" - description: - name: stream_transform - sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" - url: "https://pub.dev" - source: hosted - version: "2.1.0" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - sync_http: - dependency: transitive - description: - name: sync_http - sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961" - url: "https://pub.dev" - source: hosted - version: "0.3.1" - synchronized: - dependency: transitive - description: - name: synchronized - sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" - url: "https://pub.dev" - source: hosted - version: "3.3.0+3" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" - url: "https://pub.dev" - source: hosted - version: "0.7.2" - timeago: - dependency: "direct main" - description: - name: timeago - sha256: d3204eb4c788214883380253da7f23485320a58c11d145babc82ad16bf4e7764 - url: "https://pub.dev" - source: hosted - version: "3.6.1" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 - url: "https://pub.dev" - source: hosted - version: "1.4.0" - universal_file: - dependency: transitive - description: - name: universal_file - sha256: d1a957fccaad2a32023b62fe435b273ee47aaf2eb804709795e4bf4afff50960 - url: "https://pub.dev" - source: hosted - version: "1.0.0" - universal_io: - dependency: "direct main" - description: - name: universal_io - sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad" - url: "https://pub.dev" - source: hosted - version: "2.2.2" - universal_platform: - dependency: transitive - description: - name: universal_platform - sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec" - url: "https://pub.dev" - source: hosted - version: "1.1.0" - url_launcher: - dependency: "direct main" - description: - name: url_launcher - sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" - url: "https://pub.dev" - source: hosted - version: "6.3.0" - url_launcher_android: - dependency: "direct main" - description: - name: url_launcher_android - sha256: e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab - url: "https://pub.dev" - source: hosted - version: "6.3.10" - url_launcher_ios: - dependency: "direct main" - description: - name: url_launcher_ios - sha256: e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e - url: "https://pub.dev" - source: hosted - version: "6.3.1" - url_launcher_linux: - dependency: "direct main" - description: - name: url_launcher_linux - sha256: e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af - url: "https://pub.dev" - source: hosted - version: "3.2.0" - url_launcher_macos: - dependency: "direct main" - description: - name: url_launcher_macos - sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672" - url: "https://pub.dev" - source: hosted - version: "3.2.1" - url_launcher_platform_interface: - dependency: "direct main" - description: - name: url_launcher_platform_interface - sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" - url: "https://pub.dev" - source: hosted - version: "2.3.2" - url_launcher_web: - dependency: "direct main" - description: - name: url_launcher_web - sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e" - url: "https://pub.dev" - source: hosted - version: "2.3.3" - url_launcher_windows: - dependency: "direct main" - description: - name: url_launcher_windows - sha256: "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185" - url: "https://pub.dev" - source: hosted - version: "3.1.2" - uuid: - dependency: "direct overridden" - description: - name: uuid - sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff - url: "https://pub.dev" - source: hosted - version: "4.5.1" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" - video_player: - dependency: "direct main" - description: - name: video_player - sha256: "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17" - url: "https://pub.dev" - source: hosted - version: "2.9.2" - video_player_android: - dependency: "direct main" - description: - name: video_player_android - sha256: "2800d68d6d5b4c22da62453568ed68e63c35bea524d4fa42062e53d6bb591433" - url: "https://pub.dev" - source: hosted - version: "2.7.13" - video_player_avfoundation: - dependency: "direct main" - description: - name: video_player_avfoundation - sha256: cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f - url: "https://pub.dev" - source: hosted - version: "2.6.2" - video_player_platform_interface: - dependency: "direct main" - description: - name: video_player_platform_interface - sha256: "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb" - url: "https://pub.dev" - source: hosted - version: "6.2.3" - video_player_web: - dependency: "direct main" - description: - name: video_player_web - sha256: "6dcdd298136523eaf7dfc31abaf0dfba9aa8a8dbc96670e87e9d42b6f2caf774" - url: "https://pub.dev" - source: hosted - version: "2.3.2" - vm_service: - dependency: transitive - description: - name: vm_service - sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" - url: "https://pub.dev" - source: hosted - version: "14.2.5" - wakelock_plus: - dependency: transitive - description: - name: wakelock_plus - sha256: bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484 - url: "https://pub.dev" - source: hosted - version: "1.2.8" - wakelock_plus_platform_interface: - dependency: transitive - description: - name: wakelock_plus_platform_interface - sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16" - url: "https://pub.dev" - source: hosted - version: "1.2.1" - web: - dependency: transitive - description: - name: web - sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb - url: "https://pub.dev" - source: hosted - version: "1.1.0" - webdriver: - dependency: transitive - description: - name: webdriver - sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e" - url: "https://pub.dev" - source: hosted - version: "3.0.3" - webview_windows: - dependency: transitive - description: - name: webview_windows - sha256: "47fcad5875a45db29dbb5c9e6709bf5c88dcc429049872701343f91ed7255730" - url: "https://pub.dev" - source: hosted - version: "0.4.0" - win32: - dependency: "direct overridden" - description: - name: win32 - sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4 - url: "https://pub.dev" - source: hosted - version: "5.5.1" - win32_registry: - dependency: transitive - description: - name: win32_registry - sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852" - url: "https://pub.dev" - source: hosted - version: "1.1.5" - xdg_directories: - dependency: transitive - description: - name: xdg_directories - sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" - url: "https://pub.dev" - source: hosted - version: "1.1.0" - xml: - dependency: "direct main" - description: - name: xml - sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 - url: "https://pub.dev" - source: hosted - version: "6.5.0" - yaml: - dependency: transitive - description: - name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" - url: "https://pub.dev" - source: hosted - version: "3.1.2" -sdks: - dart: ">=3.5.3 <4.0.0" - flutter: ">=3.24.0" diff --git a/pubspec.yaml b/pubspec.yaml index 4294e62..96e363c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 3.0.10+10 +version: 3.0.2+12 environment: sdk: ">=3.0.0 <4.0.0" @@ -35,9 +35,9 @@ dependencies: cached_network_image_platform_interface: 4.1.1 cached_network_image_web: 1.3.1 chewie: 1.8.5 - cloud_firestore: 5.4.4 - cloud_firestore_platform_interface: 6.4.3 - cloud_firestore_web: 4.3.2 + cloud_firestore: 5.5.0 + cloud_firestore_platform_interface: 6.5.0 + cloud_firestore_web: 4.3.4 collection: 1.18.0 csslib: 0.17.3 device_info_plus: @@ -46,18 +46,18 @@ dependencies: equatable: 2.0.5 expandable: 5.0.1 file_picker: 8.1.2 - firebase_auth: 5.3.1 - firebase_auth_platform_interface: 7.4.7 - firebase_auth_web: 5.13.2 - firebase_core: 3.6.0 + firebase_auth: 5.3.3 + firebase_auth_platform_interface: 7.4.9 + firebase_auth_web: 5.13.4 + firebase_core: 3.8.0 firebase_core_platform_interface: 5.3.0 firebase_core_web: 2.18.1 - firebase_performance: 0.10.0+8 - firebase_performance_platform_interface: 0.1.4+44 - firebase_performance_web: 0.1.7+2 + firebase_performance: 0.10.0+10 + firebase_performance_platform_interface: 0.1.4+46 + firebase_performance_web: 0.1.7+4 firebase_storage: 12.3.2 - firebase_storage_platform_interface: 5.1.31 - firebase_storage_web: 3.10.2 + firebase_storage_platform_interface: 5.1.33 + firebase_storage_web: 3.10.5 flutter_animate: 4.5.0 flutter_blurhash: 0.8.2 flutter_cache_manager: 3.4.1 @@ -124,6 +124,7 @@ dependencies: shared_preferences_platform_interface: 2.4.1 shared_preferences_web: 2.4.2 shared_preferences_windows: 2.4.1 + shimmer: sign_in_with_apple: 6.1.2 sign_in_with_apple_platform_interface: 1.1.0 sign_in_with_apple_web: 2.1.0