diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 55c3452..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "naplo-plus"]
- path = refilc_plus
- url = https://git.qwit.cloud/refilc/student-plus.git
diff --git a/refilc_plus b/refilc_plus
deleted file mode 160000
index a370d2e..0000000
--- a/refilc_plus
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a370d2e1f82e7f8830446ea9c279490703568b73
diff --git a/refilc_plus/.gitignore b/refilc_plus/.gitignore
new file mode 100644
index 0000000..3a83c2f
--- /dev/null
+++ b/refilc_plus/.gitignore
@@ -0,0 +1,27 @@
+# See https://www.dartlang.org/guides/libraries/private-files
+
+# Files and directories created by pub
+.dart_tool/
+.packages
+build/
+# If you're building an application, you may want to check-in your pubspec.lock
+pubspec.lock
+
+# Directory created by dartdoc
+# If you don't generate documentation locally you can remove this line.
+doc/api/
+
+# dotenv environment variables file
+.env*
+
+# Avoid committing generated Javascript files:
+*.dart.js
+*.info.json # Produced by the --dump-info flag.
+*.js # When generated by dart2js. Don't specify *.js if your
+ # project includes source files written in JavaScript.
+*.js_
+*.js.deps
+*.js.map
+
+.flutter-plugins
+.flutter-plugins-dependencies
diff --git a/refilc_plus/LICENSE b/refilc_plus/LICENSE
new file mode 100644
index 0000000..0ad25db
--- /dev/null
+++ b/refilc_plus/LICENSE
@@ -0,0 +1,661 @@
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU Affero General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+.
diff --git a/refilc_plus/README.md b/refilc_plus/README.md
new file mode 100644
index 0000000..1e41448
--- /dev/null
+++ b/refilc_plus/README.md
@@ -0,0 +1,3 @@
+# reFilc+ ✨
+
+A collection of features only accessible for reFilc+ subscribers.
diff --git a/refilc_plus/analysis_options.yaml b/refilc_plus/analysis_options.yaml
new file mode 100644
index 0000000..fd16f92
--- /dev/null
+++ b/refilc_plus/analysis_options.yaml
@@ -0,0 +1,28 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+ # The lint rules applied to this project can be customized in the
+ # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+ # included above or to enable additional rules. A list of all available lints
+ # and their documentation is published at
+ # https://dart-lang.github.io/linter/lints/index.html.
+ #
+ # Instead of disabling a lint rule for the entire project in the
+ # section below, it can also be suppressed for a single line of code
+ # or a specific dart file by using the `// ignore: name_of_lint` and
+ # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+ # producing the lint.
+ rules:
+ # avoid_print: false # Uncomment to disable the `avoid_print` rule
+ # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/refilc_plus/lib/api/auth.dart b/refilc_plus/lib/api/auth.dart
new file mode 100644
index 0000000..e033c21
--- /dev/null
+++ b/refilc_plus/lib/api/auth.dart
@@ -0,0 +1,41 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:developer';
+import 'dart:io';
+
+import 'package:refilc/api/client.dart';
+import 'package:refilc/models/settings.dart';
+import 'package:flutter/foundation.dart';
+import 'package:refilc_plus/models/premium_result.dart';
+// import 'package:flutter/foundation.dart';
+// import 'package:flutter/services.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:uni_links/uni_links.dart';
+import 'package:http/http.dart' as http;
+// import 'package:home_widget/home_widget.dart';
+
+class PremiumAuth {
+ final SettingsProvider _settings;
+ StreamSubscription? _sub;
+
+ PremiumAuth({required SettingsProvider settings}) : _settings = settings;
+
+ initAuth({required String product, required String paymentProvider}) {
+ }
+
+ Future finishAuth(String sessionId) async {
+ await _settings.update(plusSessionId: "", premiumScopes: ["refilc.plus.*"]);
+ return false;
+ }
+
+ Future refreshAuth(
+ {bool removePremium = false, bool reactivate = false}) async {
+ await _settings.update(
+ premiumAccessToken: "",
+ premiumScopes: ["refilc.plus.*"],
+ premiumLogin: "",
+ plusSessionId: "",
+ );
+ return false;
+ }
+}
diff --git a/refilc_plus/lib/helpers/app_icon_helper.dart b/refilc_plus/lib/helpers/app_icon_helper.dart
new file mode 100644
index 0000000..a4e8ced
--- /dev/null
+++ b/refilc_plus/lib/helpers/app_icon_helper.dart
@@ -0,0 +1,60 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_dynamic_icon_plus/flutter_dynamic_icon_plus.dart';
+
+class AppIconHelper {
+ // static const _channel = MethodChannel('app_icon');
+
+ static Future setAppIcon(String iconName) async {
+ try {
+ if (await FlutterDynamicIconPlus.supportsAlternateIcons) {
+ // await FlutterDynamicIconPlus.setAlternateIconName(iconName: "icon_new");
+ if (kDebugMode) {
+ print("successfully changed app icon");
+ }
+ return;
+ }
+ } on PlatformException {
+ if (kDebugMode) {
+ print("failed to change icon");
+ }
+ } catch (e) {
+ // ha nem megy hat nem megy
+ }
+ // if (Platform.isIOS) {
+ // // change icon on ios
+ // try {
+ // if (await FlutterDynamicIcon.supportsAlternateIcons) {
+ // await _channel.invokeMethod('changeIcon', iconName);
+ // // await FlutterDynamicIcon.setApplicationIconBadgeNumber(0); we don't need this rn, but we will
+ // await FlutterDynamicIcon.setAlternateIconName(iconName);
+ // }
+ // } on PlatformException catch (e) {
+ // if (kDebugMode) {
+ // print('Failed to change app icon: ${e.message}');
+ // }
+ // } catch (e) {
+ // if (kDebugMode) {
+ // print('Ha nem megy, hat nem megy');
+ // }
+ // }
+ // } else if (Platform.isAndroid) {
+ // // change icon on android
+ // // ignore: no_leading_underscores_for_local_identifiers
+ // final _androidDynamicIconPlugin = AndroidDynamicIcon();
+ // await _androidDynamicIconPlugin.changeIcon(
+ // bundleId: 'hu.refilc.naplo',
+ // isNewIcon: iconName != 'refilc_default' ? true : false,
+ // iconName: iconName != 'refilc_default' ? iconName : '',
+ // iconNames: [
+ // 'refilc_default',
+ // 'refilc_overcomplicated',
+ // 'refilc_concept',
+ // 'refilc_pride',
+ // ],
+ // );
+ // } else {
+ // // ha nem megy hát nem megy
+ // }
+ }
+}
diff --git a/refilc_plus/lib/models/premium_result.dart b/refilc_plus/lib/models/premium_result.dart
new file mode 100644
index 0000000..613fc7d
--- /dev/null
+++ b/refilc_plus/lib/models/premium_result.dart
@@ -0,0 +1,19 @@
+class PremiumResult {
+ final String sessionId;
+ final List scopes;
+ final String login;
+
+ PremiumResult({
+ required this.sessionId,
+ required this.scopes,
+ required this.login,
+ });
+
+ factory PremiumResult.fromJson(Map json) {
+ return PremiumResult(
+ sessionId: json["session_id"] ?? "",
+ scopes: (json["scopes"] ?? []).cast(),
+ login: json["customer_id"] ?? "",
+ );
+ }
+}
diff --git a/refilc_plus/lib/models/premium_scopes.dart b/refilc_plus/lib/models/premium_scopes.dart
new file mode 100644
index 0000000..7d9b906
--- /dev/null
+++ b/refilc_plus/lib/models/premium_scopes.dart
@@ -0,0 +1,51 @@
+class PremiumScopes {
+ // everything
+ static const all = "refilc.plus.*";
+
+ // idk where it will be but i need it
+ // static const renameTeachers = "refilc.plus.RENAME_TEACHERS";
+ // static const goalPlanner = "refilc.plus.GOAL_PLANNER";
+ // static const changeAppIcon = "refilc.plus.CHANGE_APP_ICON";
+
+ // tier 1 (Kupak) (reFilc+)
+ static const maxTwoAccounts = "refilc.plus.MAX_TWO_ACCOUNTS";
+ static const earlyAccess = "refilc.plus.EARLY_ACCESS";
+ static const totalGradeCalculator = "refilc.plus.TOTAL_GRADE_CALCULATOR";
+ static const welcomeMessage = "refilc.plus.WELCOME_MESSAGE";
+ static const unlimitedSelfNotes = "refilc.plus.UNLIMITED_SELF_NOTES";
+ static const customGradeRarities = "refilc.plus.CUSTOM_GRADE_RARITIES";
+ static const gradeExporting = "refilc.plus.GRADE_EXPORTING";
+ // tier scope
+ // static const tierCap = "refilc.plus.tier.CAP";
+
+ // tier 2 (Tinta) (reFilc+ Gold)
+ static const noAccountLimit = "refilc.plus.NO_ACCOUNT_LIMIT";
+ static const appIconChange = "refilc.plus.APP_ICON_CHANGE";
+ static const liveActivityColor = "refilc.plus.LIVE_ACTIVITY_COLOR";
+ static const customFont = "refilc.plus.CUSTOM_FONT";
+ static const timetableNotes = "refilc.plus.TIMETABLE_NOTES";
+ static const unlimitedGoalPlanner = "refilc.plus.UNLIMITED_GOAL_PLANNER";
+ static const calendarSync = "refilc.plus.CALENDAR_SYNC";
+ // tier scope
+ // static const tierInk = "refilc.plus.tier.INK";
+
+ // tier 3 (Szivacs)
+ // cancelled
+ // tier scope
+ static const tierSponge = "refilc.plus.tier.SPONGE";
+
+ // uncategorized
+
+ // old scopes
+ static const nickname = "refilc.plus.NICKNAME";
+ static const gradeStats = "refilc.plus.GRADE_STATS";
+ static const customColors = "refilc.plus.CUSTOM_COLORS";
+ static const customIcons = "refilc.plus.CUSTOM_ICONS";
+ static const renameSubjects = "refilc.plus.RENAME_SUBJECTS";
+ static const timetableWidget = "refilc.plus.TIMETALBE_WIDGET";
+ static const fsTimetable = "refilc.plus.FS_TIMETABLE";
+
+ // new new tier scopes
+ static const tierBasic = "refilc.plus.tier.BASIC";
+ static const tierGold = "refilc.plus.tier.GOLD";
+}
diff --git a/refilc_plus/lib/providers/goal_provider.dart b/refilc_plus/lib/providers/goal_provider.dart
new file mode 100644
index 0000000..1ce7c3d
--- /dev/null
+++ b/refilc_plus/lib/providers/goal_provider.dart
@@ -0,0 +1,68 @@
+import 'package:refilc/api/providers/database_provider.dart';
+import 'package:refilc/api/providers/user_provider.dart';
+import 'package:refilc_kreta_api/models/subject.dart';
+import 'package:refilc_kreta_api/providers/grade_provider.dart';
+import 'package:flutter/widgets.dart';
+
+class GoalProvider extends ChangeNotifier {
+ final DatabaseProvider _db;
+ final UserProvider _user;
+
+ late bool _done = false;
+ late GradeSubject? _doneSubject;
+
+ bool get hasDoneGoals => _done;
+ GradeSubject? get doneSubject => _doneSubject;
+
+ GoalProvider({
+ required DatabaseProvider database,
+ required UserProvider user,
+ }) : _db = database,
+ _user = user;
+
+ Future fetchDone({required GradeProvider gradeProvider}) async {
+ var goalAvgs = await _db.userQuery.subjectGoalAverages(userId: _user.id!);
+ var beforeAvgs = await _db.userQuery.subjectGoalBefores(userId: _user.id!);
+
+ List subjects = gradeProvider.grades
+ .map((e) => e.subject)
+ .toSet()
+ .toList()
+ ..sort((a, b) => a.name.compareTo(b.name));
+
+ goalAvgs.forEach((k, v) {
+ if (beforeAvgs[k] == v) {
+ _done = true;
+ _doneSubject = subjects.where((e) => e.id == k).toList()[0];
+
+ notifyListeners();
+ }
+ });
+ }
+
+ void lock() {
+ _done = false;
+ _doneSubject = null;
+ }
+
+ Future clearGoal(GradeSubject subject) async {
+ final goalPlans = await _db.userQuery.subjectGoalPlans(userId: _user.id!);
+ final goalAvgs = await _db.userQuery.subjectGoalAverages(userId: _user.id!);
+ final goalBeforeGrades =
+ await _db.userQuery.subjectGoalBefores(userId: _user.id!);
+ final goalPinDates =
+ await _db.userQuery.subjectGoalPinDates(userId: _user.id!);
+
+ goalPlans.remove(subject.id);
+ goalAvgs.remove(subject.id);
+ goalBeforeGrades.remove(subject.id);
+ goalPinDates.remove(subject.id);
+
+ await _db.userStore.storeSubjectGoalPlans(goalPlans, userId: _user.id!);
+ await _db.userStore.storeSubjectGoalAverages(goalAvgs, userId: _user.id!);
+ await _db.userStore
+ .storeSubjectGoalBefores(goalBeforeGrades, userId: _user.id!);
+ await _db.userStore
+ .storeSubjectGoalPinDates(goalPinDates, userId: _user.id!);
+ }
+}
diff --git a/refilc_plus/lib/providers/plus_provider.dart b/refilc_plus/lib/providers/plus_provider.dart
new file mode 100644
index 0000000..6e83095
--- /dev/null
+++ b/refilc_plus/lib/providers/plus_provider.dart
@@ -0,0 +1,31 @@
+import 'package:refilc/models/settings.dart';
+import 'package:refilc_plus/api/auth.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
+import 'package:flutter/widgets.dart';
+
+class PlusProvider extends ChangeNotifier {
+ final SettingsProvider _settings;
+ List get scopes => _settings.premiumScopes;
+ // bool hasScope(String scope) => false;
+ bool hasScope(String scope) =>
+ scopes.contains(scope) || scopes.contains(PremiumScopes.all);
+ String get accessToken => _settings.premiumAccessToken;
+ String get login => _settings.premiumLogin;
+ bool get hasPremium =>
+ _settings.plusSessionId != "" && _settings.premiumScopes.isNotEmpty;
+
+ late final PremiumAuth _auth;
+ PremiumAuth get auth => _auth;
+
+ PlusProvider({required SettingsProvider settings}) : _settings = settings {
+ _auth = PremiumAuth(settings: _settings);
+ _settings.addListener(() {
+ notifyListeners();
+ });
+ }
+
+ Future activate({bool removePremium = false}) async {
+ await _auth.refreshAuth(removePremium: removePremium);
+ notifyListeners();
+ }
+}
diff --git a/refilc_plus/lib/ui/mobile/goal_planner/goal_complete_modal.dart b/refilc_plus/lib/ui/mobile/goal_planner/goal_complete_modal.dart
new file mode 100644
index 0000000..8af6bf7
--- /dev/null
+++ b/refilc_plus/lib/ui/mobile/goal_planner/goal_complete_modal.dart
@@ -0,0 +1,253 @@
+import 'package:refilc/api/providers/database_provider.dart';
+import 'package:refilc/api/providers/user_provider.dart';
+import 'package:refilc/theme/colors/colors.dart';
+import 'package:refilc_kreta_api/models/subject.dart';
+import 'package:refilc_mobile_ui/common/average_display.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_state_screen.i18n.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class GoalCompleteModal extends StatelessWidget {
+ const GoalCompleteModal(
+ this.subject, {
+ super.key,
+ required this.user,
+ required this.database,
+ required this.goalAverage,
+ required this.beforeAverage,
+ required this.averageDifference,
+ });
+
+ final UserProvider user;
+ final DatabaseProvider database;
+ final GradeSubject subject;
+
+ final double goalAverage;
+ final double beforeAverage;
+ final double averageDifference;
+
+ @override
+ Widget build(BuildContext context) {
+ return Dialog(
+ elevation: 0,
+ backgroundColor: Colors.transparent,
+ child: Container(
+ padding: const EdgeInsets.all(16.0),
+ decoration: BoxDecoration(
+ color: Theme.of(context).colorScheme.surface,
+ borderRadius: BorderRadius.circular(20.0),
+ ),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ mainAxisAlignment: MainAxisAlignment.center,
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Container(
+ width: double.infinity,
+ decoration: BoxDecoration(
+ image: const DecorationImage(
+ image: AssetImage('assets/images/static_confetti.png'),
+ fit: BoxFit.fitWidth,
+ alignment: Alignment.topCenter,
+ ),
+ color: Colors.white,
+ borderRadius: BorderRadius.circular(10.0),
+ ),
+ padding: const EdgeInsets.all(6.0),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Text(
+ goalAverage.toStringAsFixed(1),
+ textAlign: TextAlign.center,
+ style: const TextStyle(
+ color: Colors.white,
+ fontSize: 64.0,
+ fontWeight: FontWeight.w800,
+ ),
+ ),
+ // const SizedBox(width: 10.0),
+ // Icon(
+ // SubjectIcon.resolveVariant(
+ // subject: subject, context: context),
+ // color: Colors.white,
+ // size: 64.0,
+ // ),
+ ],
+ ),
+ ),
+ const SizedBox(height: 10.0),
+ Text(
+ 'congrats_title'.i18n,
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ fontSize: 27.0,
+ fontWeight: FontWeight.w700,
+ height: 1.2,
+ color: AppColors.of(context).text,
+ ),
+ ),
+ Text(
+ 'goal_reached'.i18n.fill(['20']),
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ fontSize: 15.0,
+ fontWeight: FontWeight.w500,
+ height: 1.1,
+ color: AppColors.of(context).text,
+ ),
+ ),
+ const SizedBox(height: 18.0),
+ Column(
+ children: [
+ Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Text(
+ 'started_at'.i18n,
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ fontSize: 17.0,
+ fontWeight: FontWeight.w500,
+ color: AppColors.of(context).text,
+ ),
+ ),
+ const SizedBox(width: 5.0),
+ AverageDisplay(
+ average: beforeAverage,
+ ),
+ ],
+ ),
+ Text(
+ 'improved_by'.i18n.fill([
+ '${averageDifference.toStringAsFixed(2)}%',
+ ]),
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ fontSize: 17.0,
+ fontWeight: FontWeight.w500,
+ color: AppColors.of(context).text,
+ ),
+ ),
+ ],
+ ),
+ const SizedBox(height: 20.0),
+ Column(
+ children: [
+ GestureDetector(
+ onTap: () {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(content: Text("Hamarosan...")),
+ );
+ },
+ child: Container(
+ width: double.infinity,
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(10.0),
+ gradient: const LinearGradient(
+ colors: [
+ Color(0xFFCAECFA),
+ Color(0xFFF4D9EE),
+ Color(0xFFF3EFDA),
+ ],
+ stops: [0.0, 0.53, 1.0],
+ begin: Alignment.topLeft,
+ end: Alignment.bottomRight,
+ ),
+ ),
+ child: Padding(
+ padding: const EdgeInsets.symmetric(vertical: 8.0),
+ child: Text(
+ 'detailed_stats'.i18n,
+ textAlign: TextAlign.center,
+ style: const TextStyle(
+ fontSize: 18.0,
+ fontWeight: FontWeight.w700,
+ color: Color(0xFF691A9B),
+ ),
+ ),
+ ),
+ ),
+ ),
+ const SizedBox(height: 10.0),
+ GestureDetector(
+ onTap: () {
+ Navigator.of(context).pop();
+ },
+ child: Container(
+ width: double.infinity,
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(10.0),
+ color: const Color.fromARGB(38, 131, 131, 131),
+ ),
+ child: Padding(
+ padding: const EdgeInsets.symmetric(vertical: 8.0),
+ child: Text(
+ 'later'.i18n,
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ fontSize: 18.0,
+ fontWeight: FontWeight.w700,
+ color: AppColors.of(context).text,
+ ),
+ ),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
+ );
+
+ // return Padding(
+ // padding: const EdgeInsets.symmetric(vertical: 100.0, horizontal: 32.0),
+ // child: Material(
+ // borderRadius: BorderRadius.circular(12.0),
+ // child: Padding(
+ // padding: const EdgeInsets.all(12.0),
+ // child: Column(
+ // children: [
+ // // content or idk
+ // ],
+ // ),
+ // ),
+ // ),
+ // );
+ }
+
+ static Future show(
+ GradeSubject subject, {
+ required BuildContext context,
+ }) async {
+ UserProvider user = Provider.of(context, listen: false);
+ DatabaseProvider db = Provider.of(context, listen: false);
+
+ var goalAvgRes = await db.userQuery.subjectGoalAverages(userId: user.id!);
+ var beforeAvgRes = await db.userQuery.subjectGoalBefores(userId: user.id!);
+
+ //DateTime goalPinDate = DateTime.parse((await db.userQuery.subjectGoalPinDates(userId: user.id!))[widget.subject.id]!);
+
+ String? goalAvgStr = goalAvgRes[subject.id];
+ String? beforeAvgStr = beforeAvgRes[subject.id];
+ double goalAvg = double.parse(goalAvgStr ?? '0.0');
+ double beforeAvg = double.parse(beforeAvgStr ?? '0.0');
+
+ double avgDifference = ((goalAvg - beforeAvg) / beforeAvg.abs()) * 100;
+
+ return showDialog(
+ // ignore: use_build_context_synchronously
+ context: context,
+ builder: (context) => GoalCompleteModal(
+ subject,
+ user: user,
+ database: db,
+ goalAverage: goalAvg,
+ beforeAverage: beforeAvg,
+ averageDifference: avgDifference,
+ ),
+ barrierDismissible: false,
+ );
+ }
+}
diff --git a/refilc_plus/lib/ui/mobile/goal_planner/goal_input.dart b/refilc_plus/lib/ui/mobile/goal_planner/goal_input.dart
new file mode 100644
index 0000000..b38bce0
--- /dev/null
+++ b/refilc_plus/lib/ui/mobile/goal_planner/goal_input.dart
@@ -0,0 +1,204 @@
+import 'package:refilc/models/settings.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
+
+class GoalInput extends StatelessWidget {
+ const GoalInput(
+ {super.key,
+ required this.currentAverage,
+ required this.value,
+ required this.onChanged});
+
+ final double currentAverage;
+ final double value;
+ final void Function(double value) onChanged;
+
+ void offsetToValue(Offset offset, Size size) {
+ double v = ((offset.dx / size.width * 4 + 1) * 10).round() / 10;
+ v = v.clamp(1.5, 5);
+ v = v.clamp(((currentAverage * 10).round() / 10), 5);
+ setValue(v);
+ }
+
+ void setValue(double v) {
+ if (v != value) {
+ HapticFeedback.lightImpact();
+ }
+ onChanged(v);
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ SettingsProvider settings = Provider.of(context);
+
+ List presets = [2, 3, 4, 5];
+ presets = presets.where((e) => gradeToAvg(e) > currentAverage).toList();
+
+ return Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ LayoutBuilder(builder: (context, size) {
+ return GestureDetector(
+ onTapDown: (details) {
+ offsetToValue(details.localPosition, size.biggest);
+ },
+ onHorizontalDragUpdate: (details) {
+ offsetToValue(details.localPosition, size.biggest);
+ },
+ child: SizedBox(
+ height: 32.0,
+ width: double.infinity,
+ child: Padding(
+ padding: const EdgeInsets.only(right: 20.0),
+ child: CustomPaint(
+ painter: GoalSliderPainter(
+ value: (value - 1) / 4,
+ settings: settings,
+ goalValue: value),
+ ),
+ ),
+ ),
+ );
+ }),
+ // const SizedBox(height: 12.0),
+ // Row(
+ // mainAxisAlignment: MainAxisAlignment.center,
+ // children: presets.map((e) {
+ // final pv = (value * 10).round() / 10;
+ // final selected = gradeToAvg(e) == pv;
+ // return Padding(
+ // padding: const EdgeInsets.symmetric(horizontal: 12.0),
+ // child: Container(
+ // decoration: BoxDecoration(
+ // borderRadius: BorderRadius.circular(99.0),
+ // color:
+ // gradeColor(e, settings).withOpacity(selected ? 1.0 : 0.2),
+ // border: Border.all(color: gradeColor(e, settings), width: 4),
+ // ),
+ // child: Material(
+ // type: MaterialType.transparency,
+ // child: InkWell(
+ // borderRadius: BorderRadius.circular(99.0),
+ // onTap: () => setValue(gradeToAvg(e)),
+ // child: Padding(
+ // padding: const EdgeInsets.symmetric(
+ // vertical: 2.0, horizontal: 24.0),
+ // child: Text(
+ // e.toString(),
+ // style: TextStyle(
+ // color:
+ // selected ? Colors.white : gradeColor(e, settings),
+ // fontWeight: FontWeight.bold,
+ // fontSize: 24.0,
+ // ),
+ // ),
+ // ),
+ // ),
+ // ),
+ // ),
+ // );
+ // }).toList(),
+ // )
+ ],
+ );
+ }
+}
+
+class GoalSliderPainter extends CustomPainter {
+ final double value;
+ final SettingsProvider settings;
+ final double goalValue;
+
+ GoalSliderPainter(
+ {required this.value, required this.settings, required this.goalValue});
+
+ @override
+ void paint(Canvas canvas, Size size) {
+ final radius = size.height / 2;
+ const cpadding = 4;
+ final rect = Rect.fromLTWH(0, 0, size.width + radius, size.height);
+ // final vrect = Rect.fromLTWH(0, 0, size.width * value + radius, size.height);
+ canvas.drawRRect(
+ RRect.fromRectAndRadius(
+ rect,
+ const Radius.circular(99.0),
+ ),
+ Paint()..color = Colors.black.withOpacity(.1),
+ );
+ canvas.drawRRect(
+ RRect.fromRectAndRadius(
+ rect,
+ const Radius.circular(99.0),
+ ),
+ Paint()
+ ..shader = LinearGradient(colors: [
+ settings.gradeColors[0],
+ settings.gradeColors[1],
+ settings.gradeColors[2],
+ settings.gradeColors[3],
+ settings.gradeColors[4],
+ ]).createShader(rect),
+ );
+
+ double w = size.width + radius;
+ canvas.drawRRect(
+ RRect.fromRectAndRadius(
+ Rect.fromLTWH(
+ (w - (w * 0.986)) / 2,
+ (size.height - (size.height * 0.85)) / 2,
+ w * 0.986,
+ size.height * 0.85),
+ const Radius.circular(99.0),
+ ),
+ Paint()..color = Colors.white.withOpacity(.8),
+ );
+
+ canvas.drawOval(
+ Rect.fromCircle(
+ center: Offset(size.width * value, size.height / 2),
+ radius: radius - cpadding),
+ Paint()..color = Colors.white,
+ );
+ canvas.drawOval(
+ Rect.fromCircle(
+ center: Offset(size.width * value, size.height / 2),
+ radius: (radius - cpadding) * 0.8),
+ Paint()..color = gradeColor(goalValue.round(), settings),
+ );
+
+ for (int i = 1; i < 4; i++) {
+ canvas.drawOval(
+ Rect.fromCircle(
+ center: Offset(size.width / 4 * i, size.height / 2), radius: 4),
+ Paint()..color = Colors.white.withOpacity(.6),
+ );
+ }
+ }
+
+ @override
+ bool shouldRepaint(GoalSliderPainter oldDelegate) {
+ return oldDelegate.value != value;
+ }
+}
+
+double gradeToAvg(int grade) {
+ return grade - 0.5;
+}
+
+Color gradeColor(int grade, SettingsProvider settings) {
+ // return [
+ // const Color(0xffFF3B30),
+ // const Color(0xffFF9F0A),
+ // const Color(0xffFFD60A),
+ // const Color(0xff34C759),
+ // const Color(0xff247665),
+ // ].elementAt(grade.clamp(1, 5) - 1);
+ return [
+ settings.gradeColors[0],
+ settings.gradeColors[1],
+ settings.gradeColors[2],
+ settings.gradeColors[3],
+ settings.gradeColors[4],
+ ].elementAt(grade.clamp(1, 5) - 1);
+}
diff --git a/refilc_plus/lib/ui/mobile/goal_planner/goal_planner.dart b/refilc_plus/lib/ui/mobile/goal_planner/goal_planner.dart
new file mode 100644
index 0000000..1a649e2
--- /dev/null
+++ b/refilc_plus/lib/ui/mobile/goal_planner/goal_planner.dart
@@ -0,0 +1,191 @@
+/*
+ * Maintainer: DarK
+ * Translated from C version
+ * Minimal Working Fixed @ 2022.12.25
+ * ##Please do NOT modify if you don't know whats going on##
+ *
+ * Issue: #59
+ *
+ * Future changes / ideas:
+ * - `best` should be configurable
+ */
+import 'dart:math';
+import 'package:refilc_kreta_api/models/category.dart';
+import 'package:refilc_kreta_api/models/grade.dart';
+import 'package:refilc_kreta_api/models/subject.dart';
+import 'package:refilc_kreta_api/models/teacher.dart';
+import 'package:flutter/foundation.dart' show listEquals;
+
+/// Generate list of grades that achieve the wanted goal.
+/// After generating possible options, it (when doing so would NOT result in empty list) filters with two criteria:
+/// - Plan should not contain more than 15 grades
+/// - Plan should not contain only one type of grade
+///
+/// **Usage**:
+///
+/// ```dart
+/// List GoalPlanner(double goal, List grades).solve().plan
+/// ```
+class GoalPlanner {
+ final double goal;
+ final List grades;
+ List plans = [];
+ GoalPlanner(this.goal, this.grades);
+
+ bool _allowed(int grade) => grade > goal;
+
+ void _generate(Generator g) {
+ // Exit condition 1: Generator has working plan.
+ if (g.currentAvg.avg >= goal) {
+ plans.add(Plan(g.plan));
+ return;
+ }
+ // Exit condition 2: Generator plan will never work.
+ if (!_allowed(g.gradeToAdd)) {
+ return;
+ }
+
+ for (int i = g.max; i >= 0; i--) {
+ int newGradeToAdd = g.gradeToAdd - 1;
+ List newPlan =
+ GoalPlannerHelper._addToList(g.plan, g.gradeToAdd, i);
+
+ Avg newAvg = GoalPlannerHelper._addToAvg(g.currentAvg, g.gradeToAdd, i);
+ int newN = GoalPlannerHelper.howManyNeeded(
+ newGradeToAdd,
+ grades +
+ newPlan
+ .map((e) => Grade(
+ id: '',
+ date: DateTime(0),
+ value: GradeValue(e, '', '', 100),
+ teacher: Teacher.fromString(''),
+ description: '',
+ form: '',
+ groupId: '',
+ type: GradeType.midYear,
+ subject: GradeSubject.fromJson({}),
+ mode: Category.fromJson({}),
+ seenDate: DateTime(0),
+ writeDate: DateTime(0),
+ ))
+ .toList(),
+ goal);
+
+ _generate(Generator(newGradeToAdd, newN, newAvg, newPlan));
+ }
+ }
+
+ List solve() {
+ _generate(
+ Generator(
+ 5,
+ GoalPlannerHelper.howManyNeeded(
+ 5,
+ grades,
+ goal,
+ ),
+ Avg(GoalPlannerHelper.averageEvals(grades),
+ GoalPlannerHelper.weightSum(grades)),
+ [],
+ ),
+ );
+
+ // Calculate Statistics
+ for (var e in plans) {
+ e.sum = e.plan.fold(0, (int a, b) => a + b);
+ e.avg = e.sum / e.plan.length;
+ e.sigma = sqrt(
+ e.plan.map((i) => pow(i - e.avg, 2)).fold(0, (num a, b) => a + b) /
+ e.plan.length);
+ }
+
+ // filter without aggression
+ if (plans.where((e) => e.plan.length < 30).isNotEmpty) {
+ plans.removeWhere((e) => !(e.plan.length < 30));
+ }
+ if (plans.where((e) => e.sigma > 1).isNotEmpty) {
+ plans.removeWhere((e) => !(e.sigma > 1));
+ }
+
+ return plans;
+ }
+}
+
+class Avg {
+ final double avg;
+ final double n;
+
+ Avg(this.avg, this.n);
+}
+
+class Generator {
+ final int gradeToAdd;
+ final int max;
+ final Avg currentAvg;
+ final List plan;
+
+ Generator(this.gradeToAdd, this.max, this.currentAvg, this.plan);
+}
+
+class Plan {
+ final List plan;
+ int sum = 0;
+ double avg = 0;
+ int med = 0; // currently
+ int mod = 0; // unused
+ double sigma = 0;
+
+ Plan(this.plan);
+
+ String get dbString {
+ var finalString = '';
+ for (var i in plan) {
+ finalString += "$i,";
+ }
+ return finalString;
+ }
+
+ @override
+ bool operator ==(other) => other is Plan && listEquals(plan, other.plan);
+
+ @override
+ int get hashCode => Object.hashAll(plan);
+}
+
+class GoalPlannerHelper {
+ static Avg _addToAvg(Avg base, int grade, int n) =>
+ Avg((base.avg * base.n + grade * n) / (base.n + n), base.n + n);
+
+ static List _addToList(List l, T e, int n) {
+ if (n == 0) return l;
+ List tmp = l;
+ for (int i = 0; i < n; i++) {
+ tmp = tmp + [e];
+ }
+ return tmp;
+ }
+
+ static int howManyNeeded(int grade, List base, double goal) {
+ double avg = averageEvals(base);
+ double wsum = weightSum(base);
+ if (avg >= goal) return 0;
+ if (grade * 1.0 == goal) return -1;
+ int candidate = (wsum * (avg - goal) / (goal - grade)).floor();
+ return (candidate * grade + avg * wsum) / (candidate + wsum) < goal
+ ? candidate + 1
+ : candidate;
+ }
+
+ static double averageEvals(List grades, {bool finalAvg = false}) {
+ double average = grades
+ .map((e) => e.value.value * e.value.weight / 100.0)
+ .fold(0.0, (double a, double b) => a + b) /
+ weightSum(grades, finalAvg: finalAvg);
+ return average.isNaN ? 0.0 : average;
+ }
+
+ static double weightSum(List grades, {bool finalAvg = false}) => grades
+ .map((e) => finalAvg ? 1 : e.value.weight / 100)
+ .fold(0, (a, b) => a + b);
+}
diff --git a/refilc_plus/lib/ui/mobile/goal_planner/goal_planner_screen.dart b/refilc_plus/lib/ui/mobile/goal_planner/goal_planner_screen.dart
new file mode 100644
index 0000000..16a71a2
--- /dev/null
+++ b/refilc_plus/lib/ui/mobile/goal_planner/goal_planner_screen.dart
@@ -0,0 +1,453 @@
+import 'package:refilc/api/providers/database_provider.dart';
+import 'package:refilc/api/providers/user_provider.dart';
+import 'package:refilc/helpers/average_helper.dart';
+import 'package:refilc/helpers/subject.dart';
+import 'package:refilc/models/settings.dart';
+import 'package:refilc_kreta_api/models/grade.dart';
+import 'package:refilc_kreta_api/models/group_average.dart';
+import 'package:refilc_kreta_api/models/subject.dart';
+import 'package:refilc_kreta_api/providers/grade_provider.dart';
+import 'package:refilc_mobile_ui/common/average_display.dart';
+import 'package:refilc_mobile_ui/common/round_border_icon.dart';
+import 'package:refilc_mobile_ui/pages/grades/calculator/grade_calculator_provider.dart';
+import 'package:refilc_plus/models/premium_scopes.dart';
+import 'package:refilc_plus/providers/plus_provider.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_input.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_planner_screen.i18n.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/goal_track_popup.dart';
+import 'package:refilc_plus/ui/mobile/goal_planner/route_option.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+enum PlanResult {
+ available, // There are possible solutions
+ unreachable, // The solutions are too hard don't even try
+ unsolvable, // There are no solutions
+ reached, // Goal already reached
+}
+
+class GoalPlannerScreen extends StatefulWidget {
+ final GradeSubject subject;
+
+ const GoalPlannerScreen({super.key, required this.subject});
+
+ @override
+ State createState() => _GoalPlannerScreenState();
+}
+
+class _GoalPlannerScreenState extends State {
+ late GradeProvider gradeProvider;
+ late GradeCalculatorProvider calculatorProvider;
+ late SettingsProvider settingsProvider;
+ late DatabaseProvider dbProvider;
+ late UserProvider user;
+
+ bool gradeCalcMode = false;
+
+ List getSubjectGrades(GradeSubject subject) => !gradeCalcMode
+ ? gradeProvider.grades.where((e) => e.subject == subject).toList()
+ : calculatorProvider.grades.where((e) => e.subject == subject).toList();
+
+ double goalValue = 4.0;
+ List grades = [];
+
+ Plan? recommended;
+ Plan? fastest;
+ Plan? selectedRoute;
+ List otherPlans = [];
+
+ @override
+ void initState() {
+ super.initState();
+ user = Provider.of(context, listen: false);
+ dbProvider = Provider.of(context, listen: false);
+ }
+
+ Future> fetchGoalPlans() async {
+ return await dbProvider.userQuery.subjectGoalPlans(userId: user.id!);
+ }
+
+ Future> fetchGoalAverages() async {
+ return await dbProvider.userQuery.subjectGoalAverages(userId: user.id!);
+ }
+
+ // haha bees lol
+ Future> fetchGoalBees() async {
+ return await dbProvider.userQuery.subjectGoalBefores(userId: user.id!);
+ }
+
+ Future> fetchGoalPinDates() async {
+ return await dbProvider.userQuery.subjectGoalPinDates(userId: user.id!);
+ }
+
+ PlanResult getResult() {
+ final currentAvg = GoalPlannerHelper.averageEvals(grades);
+
+ recommended = null;
+ fastest = null;
+ otherPlans = [];
+
+ if (currentAvg >= goalValue) return PlanResult.reached;
+
+ final planner = GoalPlanner(goalValue, grades);
+ final plans = planner.solve();
+
+ plans.sort((a, b) => (a.avg - (2 * goalValue + 5) / 3)
+ .abs()
+ .compareTo(b.avg - (2 * goalValue + 5) / 3));
+
+ try {
+ final singleSolution = plans.every((e) => e.sigma == 0);
+ recommended =
+ plans.where((e) => singleSolution ? true : e.sigma > 0).first;
+ plans.removeWhere((e) => e == recommended);
+ } catch (_) {}
+
+ plans.sort((a, b) => a.plan.length.compareTo(b.plan.length));
+
+ try {
+ fastest = plans.removeAt(0);
+ } catch (_) {}
+
+ // print((recommended?.plan.length ?? 0).toString() + '-kuki');
+ // print((fastest?.plan.length ?? 0).toString() + '--asd');
+
+ if ((((recommended?.plan.length ?? 0) - (fastest?.plan.length ?? 0)) >=
+ 5) &&
+ fastest != null) {
+ recommended = fastest;
+ }
+
+ if (recommended == null) {
+ recommended = null;
+ fastest = null;
+ otherPlans = [];
+ selectedRoute = null;
+ return PlanResult.unsolvable;
+ }
+
+ // print(recommended!.plan.length.toString() + '--------');
+
+ if (recommended!.plan.length > 20) {
+ recommended = null;
+ fastest = null;
+ otherPlans = [];
+ selectedRoute = null;
+ return PlanResult.unreachable;
+ }
+
+ otherPlans = List.from(plans);
+
+ // only save 2 items if not plus member
+ if (!Provider.of(context)
+ .hasScope(PremiumScopes.unlimitedGoalPlanner)) {
+ if (otherPlans.length > 2) {
+ otherPlans.removeRange(2, otherPlans.length - 1);
+ }
+ }
+
+ return PlanResult.available;
+ }
+
+ void getGrades() {
+ grades = getSubjectGrades(widget.subject).toList();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ gradeProvider = Provider.of(context);
+ calculatorProvider = Provider.of(context);
+ settingsProvider = Provider.of(context);
+
+ getGrades();
+
+ final currentAvg = GoalPlannerHelper.averageEvals(grades);
+
+ final result = getResult();
+
+ List subjectGrades = getSubjectGrades(widget.subject);
+
+ double avg = AverageHelper.averageEvals(subjectGrades);
+
+ var nullavg = GroupAverage(average: 0.0, subject: widget.subject, uid: "0");
+ double groupAverage = gradeProvider.groupAverages
+ .firstWhere((e) => e.subject == widget.subject, orElse: () => nullavg)
+ .average;
+
+ return Scaffold(
+ body: SafeArea(
+ child: ListView(
+ padding: const EdgeInsets.only(
+ top: 5.0,
+ bottom: 220.0,
+ right: 15.0,
+ left: 2.0,
+ ),
+ children: [
+ // Row(
+ // mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ // children: [
+ // const BackButton(),
+ // Padding(
+ // padding: const EdgeInsets.only(right: 15.0),
+ // child: Row(
+ // children: [
+ // Text(
+ // 'goal_planner_title'.i18n,
+ // style: const TextStyle(
+ // fontWeight: FontWeight.w500, fontSize: 18.0),
+ // ),
+ // const SizedBox(
+ // width: 5,
+ // ),
+ // const BetaChip(),
+ // ],
+ // ),
+ // ),
+ // ],
+ // ),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ Row(
+ children: [
+ const BackButton(),
+ BackButton(
+ color: Colors.red,
+ onPressed: () =>
+ GoalTrackPopup.show(context, subject: widget.subject),
+ ),
+ RoundBorderIcon(
+ icon: Icon(
+ SubjectIcon.resolveVariant(
+ context: context,
+ subject: widget.subject,
+ ),
+ size: 18,
+ weight: 1.5,
+ ),
+ ),
+ const SizedBox(
+ width: 5.0,
+ ),
+ Text(
+ (widget.subject.isRenamed
+ ? widget.subject.renamedTo
+ : widget.subject.name) ??
+ 'goal_planner_title'.i18n,
+ style: const TextStyle(
+ fontSize: 20.0,
+ fontWeight: FontWeight.w700,
+ ),
+ ),
+ ],
+ ),
+ Row(
+ children: [
+ if (groupAverage != 0)
+ AverageDisplay(average: groupAverage, border: true),
+ const SizedBox(width: 6.0),
+ AverageDisplay(average: avg),
+ ],
+ ),
+ ],
+ ),
+ const SizedBox(height: 12.0),
+ Padding(
+ padding: const EdgeInsets.only(left: 22.0, right: 22.0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ "set_a_goal".i18n,
+ style: const TextStyle(
+ fontWeight: FontWeight.bold,
+ fontSize: 20.0,
+ ),
+ ),
+ const SizedBox(height: 4.0),
+ Text(
+ goalValue.toString(),
+ style: TextStyle(
+ fontWeight: FontWeight.w900,
+ fontSize: 48.0,
+ color: gradeColor(goalValue.round(), settingsProvider),
+ ),
+ ),
+ // Column(
+ // mainAxisAlignment: MainAxisAlignment.center,
+ // children: [
+ // Text(
+ // "select_subject".i18n,
+ // style: const TextStyle(
+ // fontWeight: FontWeight.bold,
+ // fontSize: 20.0,
+ // ),
+ // ),
+ // const SizedBox(height: 4.0),
+ // Column(
+ // children: [
+ // Icon(
+ // SubjectIcon.resolveVariant(
+ // context: context,
+ // subject: widget.subject,
+ // ),
+ // size: 48.0,
+ // ),
+ // Text(
+ // (widget.subject.isRenamed
+ // ? widget.subject.renamedTo
+ // : widget.subject.name) ??
+ // '',
+ // style: const TextStyle(
+ // fontSize: 17.0,
+ // fontWeight: FontWeight.w500,
+ // ),
+ // )
+ // ],
+ // )
+ // ],
+ // )
+ const SizedBox(height: 24.0),
+ Text(
+ "pick_route".i18n,
+ style: const TextStyle(
+ fontWeight: FontWeight.bold,
+ fontSize: 20.0,
+ ),
+ ),
+ const SizedBox(height: 12.0),
+ if (recommended != null)
+ RouteOption(
+ plan: recommended!,
+ mark: RouteMark.recommended,
+ selected: selectedRoute == recommended!,
+ onSelected: () => setState(() {
+ selectedRoute = recommended;
+ }),
+ ),
+ if (fastest != null && fastest != recommended)
+ RouteOption(
+ plan: fastest!,
+ mark: RouteMark.fastest,
+ selected: selectedRoute == fastest!,
+ onSelected: () => setState(() {
+ selectedRoute = fastest;
+ }),
+ ),
+ ...otherPlans.map((e) => RouteOption(
+ plan: e,
+ selected: selectedRoute == e,
+ onSelected: () => setState(() {
+ selectedRoute = e;
+ }),
+ )),
+ if (result != PlanResult.available) Text(result.name.i18n),
+ ],
+ ),
+ ),
+ ],
+ ),
+ ),
+ bottomSheet: MediaQuery.removePadding(
+ context: context,
+ removeBottom: false,
+ removeTop: true,
+ child: Container(
+ color: Theme.of(context).scaffoldBackgroundColor,
+ child: Container(
+ padding: const EdgeInsets.only(top: 24.0),
+ decoration: BoxDecoration(
+ color: Theme.of(context).colorScheme.surface,
+ borderRadius:
+ const BorderRadius.vertical(top: Radius.circular(24.0)),
+ boxShadow: [
+ BoxShadow(
+ color: Colors.black.withOpacity(.1),
+ blurRadius: 8.0,
+ )
+ ]),
+ child: SafeArea(
+ child: Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 20.0),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ GoalInput(
+ value: goalValue,
+ currentAverage: currentAvg,
+ onChanged: (v) => setState(() {
+ selectedRoute = null;
+ goalValue = v;
+ }),
+ ),
+ const SizedBox(height: 24.0),
+ SizedBox(
+ width: double.infinity,
+ child: RawMaterialButton(
+ onPressed: () async {
+ if (selectedRoute == null) {
+ ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+ content: Text('${"pick_route".i18n}...')));
+ }
+
+ final goalPlans = await fetchGoalPlans();
+ final goalAvgs = await fetchGoalAverages();
+ final goalBeforeGrades = await fetchGoalBees();
+ final goalPinDates = await fetchGoalPinDates();
+
+ goalPlans[widget.subject.id] =
+ selectedRoute!.dbString;
+ goalAvgs[widget.subject.id] =
+ goalValue.toStringAsFixed(2);
+ goalBeforeGrades[widget.subject.id] =
+ avg.toStringAsFixed(2);
+ goalPinDates[widget.subject.id] =
+ DateTime.now().toIso8601String();
+ // goalPlans[widget.subject.id] = '1,2,3,4,5,';
+ // goalAvgs[widget.subject.id] = '3.69';
+ // goalBeforeGrades[widget.subject.id] = '3.69';
+ // goalPinDates[widget.subject.id] =
+ // DateTime.now().toIso8601String();
+
+ await dbProvider.userStore.storeSubjectGoalPlans(
+ goalPlans,
+ userId: user.id!);
+ await dbProvider.userStore.storeSubjectGoalAverages(
+ goalAvgs,
+ userId: user.id!);
+ await dbProvider.userStore.storeSubjectGoalBefores(
+ goalBeforeGrades,
+ userId: user.id!);
+ await dbProvider.userStore.storeSubjectGoalPinDates(
+ goalPinDates,
+ userId: user.id!);
+
+ // ignore: use_build_context_synchronously
+ Navigator.of(context).pop();
+ },
+ fillColor: Theme.of(context).colorScheme.secondary,
+ shape: const StadiumBorder(),
+ padding: const EdgeInsets.symmetric(vertical: 8.0),
+ child: Text(
+ "track_it".i18n,
+ style: const TextStyle(
+ color: Colors.white,
+ fontSize: 20.0,
+ fontWeight: FontWeight.w600,
+ ),
+ ),
+ ),
+ )
+ ],
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/refilc_plus/lib/ui/mobile/goal_planner/goal_planner_screen.i18n.dart b/refilc_plus/lib/ui/mobile/goal_planner/goal_planner_screen.i18n.dart
new file mode 100644
index 0000000..8b1ec3b
--- /dev/null
+++ b/refilc_plus/lib/ui/mobile/goal_planner/goal_planner_screen.i18n.dart
@@ -0,0 +1,70 @@
+import 'package:i18n_extension/i18n_extension.dart';
+
+extension Localization on String {
+ static final _t = Translations.byLocale("hu_hu") +
+ {
+ "en_en": {
+ "goal_planner_title": "Goal Planning",
+ "set_a_goal": "Your Goal",
+ "select_subject": "Subject",
+ "pick_route": "Pick a Route",
+ "track_it": "Track it!",
+ "recommended": "Recommended",
+ "fastest": "Fastest",
+ "unsolvable": "Unsolvable :(",
+ "unreachable": "Unreachable :(",
+ "reached": "Already reached! :D",
+ // new plan popup
+ "goalplan_title": "Goal Planning",
+ "goalplan_subtitle": "Enter the average you want to achieve!",
+ "goalplan_plans_title": "Choose the route",
+ "goalplan_plans_subtitle":
+ "You can achieve your goal with these tickets, choose one that you like the most! You can change this later.",
+ "show_my_ways": "Show me my options!",
+ },
+ "hu_hu": {
+ "goal_planner_title": "Cél követés",
+ "set_a_goal": "Kitűzött cél",
+ "select_subject": "Tantárgy",
+ "pick_route": "Válassz egy utat",
+ "track_it": "Követés!",
+ "recommended": "Ajánlott",
+ "fastest": "Leggyorsabb",
+ "unsolvable": "Megoldhatatlan :(",
+ "unreachable": "Elérhetetlen :(",
+ "reached": "Már elérted! :D",
+ // new plan popup
+ "goalplan_title": "Cél kitűzése",
+ "goalplan_subtitle": "Add meg az elérni kívánt átlagot!",
+ "goalplan_plans_title": "Válaszd ki az utat",
+ "goalplan_plans_subtitle":
+ "Ezekkel a jegyekkel érheted el a célodat, válassz egyet, ami a legjobban tetszik! Ezt később változtathatod.",
+ "show_my_ways": "Mutasd a lehetőségeimet!",
+ },
+ "de_de": {
+ "goal_planner_title": "Zielplanung",
+ "set_a_goal": "Dein Ziel",
+ "select_subject": "Thema",
+ "pick_route": "Wähle einen Weg",
+ "track_it": "Verfolge es!",
+ "recommended": "Empfohlen",
+ "fastest": "Am schnellsten",
+ "unsolvable": "Unlösbar :(",
+ "unreachable": "Unerreichbar :(",
+ "reached": "Bereits erreicht! :D",
+ // new plan popup
+ "goalplan_title": "Zielplanung",
+ "goalplan_subtitle":
+ "Geben Sie den Durchschnitt ein, den Sie erreichen möchten!",
+ "goalplan_plans_title": "Wählen Sie die Route",
+ "goalplan_plans_subtitle":
+ "Sie können Ihr Ziel mit diesen Tickets erreichen. Wählen Sie eines aus, das Ihnen am besten gefällt! Sie können dies später ändern.",
+ "show_my_ways": "Zeigen Sie mir meine Optionen!",
+ },
+ };
+
+ String get i18n => localize(this, _t);
+ String fill(List