Merge pull request #75 from refilc/dev

added gitignore

.gitignore

@@ -1,51 +1,37 @@
-# See https://www.dartlang.org/guides/libraries/private-files
 
-.gitignore
+filcnaplo/.flutter-plugins
+filcnaplo/.flutter-plugins-dependencies
+filcnaplo/pubspec.lock
+filcnaplo/.dart_tool/
+filcnaplo/android/
+filcnaplo/ios/
+filcnaplo/windows/
+filcnaplo/linux/
+filcnaplo/macos/
+filcnaplo/build/
 
-termek.txt
+filcnaplo_desktop_ui/.flutter-plugins
-.DS_Store
+filcnaplo_desktop_ui/.flutter-plugins-dependencies
-filc3.properties
+filcnaplo_desktop_ui/pubspec.lock
-local.properties
+filcnaplo_desktop_ui/.dart_tool/
-# 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
+filcnaplo_kreta_api/.flutter-plugins
-# If you don't generate documentation locally you can remove this line.
+filcnaplo_kreta_api/.flutter-plugins-dependencies
-doc/api/
+filcnaplo_kreta_api/pubspec.lock
+filcnaplo_kreta_api/.dart_tool/
 
-# Avoid committing generated Javascript files:
+filcnaplo_mobile_ui/.flutter-plugins
-*.dart.js
+filcnaplo_mobile_ui/.flutter-plugins-dependencies
-*.info.json      # Produced by the --dump-info flag.
+filcnaplo_mobile_ui/pubspec.lock
-*.js             # When generated by dart2js. Don't specify *.js if your
+filcnaplo_mobile_ui/.dart_tool/
-                 # project includes source files written in JavaScript.
-*.js_
-*.js.deps
-*.js.map
 
-*.txt
+filcnaplo_premium/.flutter-plugins
-filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift
+filcnaplo_premium/.flutter-plugins-dependencies
-filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/connectivity_plus
+filcnaplo_premium/pubspec.lock
-filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/dynamic_color
+filcnaplo_premium/.dart_tool/
-filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/flutter_acrylic
+filcnaplo_premium/android/
-filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/path_provider_windows
-filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/permission_handler_windows
-filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/share_plus_windows
-filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/url_launcher_windows
-filcnaplo/windows/flutter/ephemeral/generated_config.cmake
-filcnaplo/windows/flutter/generated_plugin_registrant.cc
-filcnaplo/windows/flutter/generated_plugin_registrant.h
-filcnaplo/windows/flutter/generated_plugins.cmake
-filcnaplo/linux/flutter/generated_plugin_registrant.cc
-filcnaplo/linux/flutter/generated_plugin_registrant.h
-filcnaplo/linux/flutter/generated_plugins.cmake
-filcnaplo/macos/Flutter/*
-filcnaplo/ios/Podfile.lock
-.vscode/
-key.properties
 
-.flutter-plugins*
+.vscode
-filcnaplo/ios/Flutter/flutter_export_environment 4.sh
+.github
+.idea
+.gitmodules

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.vscode/launch.json

@@ -1,33 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "filcnaplo",
-      "cwd": "filcnaplo",
-      "request": "launch",
-      "type": "dart",
-      "toolArgs": [
-        "--dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1)"
-      ]
-    },
-    {
-      "name": "filcnaplo release",
-      "cwd": "filcnaplo release",
-      "request": "launch",
-      "type": "dart",
-      "flutterMode": "release",
-      "program": "lib/main.dart",
-      "toolArgs": [
-        "--dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1)"
-      ]
-    },
-    {
-      "name": "Flutter",
-      "program": "lib/main.dart",
-      "cwd": "filcnaplo",
-      "request": "launch",
-      "type": "dart",
-      "flutterMode": "debug"
-    }
-  ]
-}

LICENSE

@@ -1,29 +1,661 @@
-BSD 3-Clause License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Copyright (c) 2023, reFilc
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
-All rights reserved.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Redistribution and use in source and binary forms, with or without
+                            Preamble
-modification, are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice, this
+  The GNU Affero General Public License is a free, copyleft license for
-   list of conditions and the following disclaimer.
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
+  The licenses for most software and other practical works are designed
-   this list of conditions and the following disclaimer in the documentation
+to take away your freedom to share and change the works.  By contrast,
-   and/or other materials provided with the distribution.
+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.
 
-3. Neither the name of the copyright holder nor the names of its
+  When we speak of free software, we are referring to freedom, not
-   contributors may be used to endorse or promote products derived from
+price.  Our General Public Licenses are designed to make sure that you
-   this software without specific prior written permission.
+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.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  Developers that use our General Public Licenses protect your rights
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+with two steps: (1) assert copyright on the software, and (2) offer
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+you this License which gives you legal permission to copy, distribute
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+and/or modify the software.
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  A secondary benefit of defending all users' freedom is that
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+improvements made in alternate versions of the program, if they
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+receive widespread use, become available for other developers to
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+incorporate.  Many developers of free software are heartened and
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <https://www.gnu.org/licenses/>.
+
+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
+<https://www.gnu.org/licenses/>.

README.md

@@ -36,15 +36,17 @@ Az összes (ugyan azon verzióhoz tartozó) contribution meg fog jelenni a relea
 -------
 
 # Team
-
-**kima:** head developer / project manager
-
-**Reiner, pdf, Pearoo:** community- and project manager / developer
 
-**vrolandd, TMarccci:** head developer
+**kima:** head developer / project manager
-
+
-**dwe., xou:** designer
+**Reiner, pdf, Pearoo, Zizi:** community- and project manager / developer
-
+
-**Péter:** social media manager / video editor
+**vrolandd, TMarccci:** head developer
-
+
-**annon:** a régi Filc Napló fejlesztője (ez az app, ha bár sokban változott, alapjaiban a Filc-re épül)
+**dwe., xou, SebRHQ:** designer
+
+**Péter:** video editor
+
+**annon:** a régi Filc Napló fejlesztője (ez az app, ha bár sokban változott, alapjaiban a Filc-re épül)
+
+<sup>Ez a projekt egy fork; az eredeti projektet megtaláljátok itt: [filc/naplo-archive](https://github.com/filc/naplo-archive) (köszi, annon)</sup>

filcnaplo/.gitignore

@@ -1,47 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# Web related
-lib/generated_plugin_registrant.dart
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
-key.properties

filcnaplo/android/.gitignore

@@ -1,12 +0,0 @@
-gradle-wrapper.jar
-/.gradle
-/captures/
-/gradlew
-/gradlew.bat
-/local.properties
-GeneratedPluginRegistrant.java
-
-# Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
-key.properties
-.project

filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetable.java

@@ -26,6 +26,11 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import java.util.HashMap;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import hu.refilc.naplo.database.DBManager;
 import hu.refilc.naplo.MainActivity;
@@ -247,71 +252,61 @@ public class WidgetTimetable extends HomeWidgetProvider {
     }
 
     public static List<JSONArray> genJsonDays(Context context) {
-        List<JSONArray> gen_days = new ArrayList<>();
+        List<JSONArray> genDays = new ArrayList<>();
+        Map<String, JSONArray> dayMap = new HashMap<>();
 
         DBManager dbManager = new DBManager(context.getApplicationContext());
+
         try {
             dbManager.open();
             Cursor ct = dbManager.fetchTimetable();
-            dbManager.close();
 
-            if(ct.getCount() == 0) {
+            if (ct.getCount() == 0) {
-                return gen_days;
+                return genDays;
             }
 
-            JSONObject fecthtt = new JSONObject(ct.getString(0));
+            JSONObject fetchedTimetable = new JSONObject(ct.getString(0));
+            String currentWeek = String.valueOf(Week.current().id());
+            JSONArray week = fetchedTimetable.getJSONArray(currentWeek);
 
-            JSONArray dayArray = new JSONArray();
+            // Organize lessons into dates
-            String currday = "";
+            for (int i = 0; i < week.length(); i++) {
-
-            String currweek = String.valueOf(Week.current().id());
-
-            JSONArray week = fecthtt.getJSONArray(currweek);
-
-            for (int i=0; i < week.length(); i++)
-            {
                 try {
-                    if(i == 0) currday = week.getJSONObject(0).getString("Datum");
+                    JSONObject entry = week.getJSONObject(i);
-                    JSONObject oraObj = week.getJSONObject(i);
+                    String date = entry.getString("Datum");
-
+                    dayMap.computeIfAbsent(date, k -> new JSONArray()).put(entry);
-                    if(!currday.equals(oraObj.getString("Datum"))) {
+                } catch (JSONException e) {
-                        gen_days.add(dayArray);
-                        currday = week.getJSONObject(i).getString("Datum");
-                        dayArray = new JSONArray();
-                    }
-
-                    dayArray.put(oraObj);
-                    if(i == week.length() - 1) {
-                        gen_days.add(dayArray);
-                    }
-                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
+
+            genDays.addAll(dayMap.values());
+
+            // Sort the 'genDays' list of JSON based on the start time of the first entry
+            genDays.sort((day1, day2) -> {
+                try {
+                    // Extract the start time of the first entry in each day's JSON
+                    String startTime1 = day1.getJSONObject(0).getString("KezdetIdopont");
+                    String startTime2 = day2.getJSONObject(0).getString("KezdetIdopont");
+                    // Compare the start times and return the result for sorting
+                    return startTime1.compareTo(startTime2);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                    return 0;
+                }
+            });
+
         } catch (Exception e) {
             e.printStackTrace();
+        } finally {
+            dbManager.close();
         }
 
-        Collections.sort(gen_days, new Comparator<JSONArray>() {
+        return genDays;
-
-            public int compare(JSONArray a, JSONArray b) {
-                long valA = 0;
-                long valB = 0;
-
-                try {
-                    valA = (long) new DateTime( a.getJSONObject(0).getString("Datum")).getMillis();
-                    valB = (long) new DateTime( b.getJSONObject(0).getString("Datum")).getMillis();
-                }
-                catch (JSONException ignored) {
-                }
-
-                return (int) (valA - valB);
-            }
-        });
-
-        return gen_days;
     }
 
+
+
     public static String zeroPad(int value, int padding){
         StringBuilder b = new StringBuilder();
         b.append(value);

filcnaplo/android/app/src/main/java/hu/refilc/naplo/widget_timetable/WidgetTimetableDataProvider.java

@@ -335,10 +335,12 @@ public class WidgetTimetableDataProvider implements RemoteViewsService.RemoteVie
 
     public Lesson jsonToLesson(JSONObject json) {
         try {
+            String name = json.getString("Nev");
+            name = name.substring(0, 1).toUpperCase() + name.substring(1); // Capitalize name
             return new Lesson(
                     json.getJSONObject("Allapot").getString("Nev"),
                     !json.getString("Oraszam").equals("null") ? json.getString("Oraszam") : "+",
-                    json.getString("Nev"),
+                    name,
                     json.getString("Tema"),
                     json.getString("TeremNeve"),
                     new DateTime(json.getString("KezdetIdopont")).getMillis(),

filcnaplo/android/app/src/main/res/layout/widget_timetable.xml

@@ -136,7 +136,7 @@
             android:layout_below="@id/iv_1"
             android:layout_marginHorizontal="15dp"
             android:fontFamily="@font/montserrat_medium"
-            android:text="A widget használatához, bejelentkezés szükséges."
+            android:text="A widget használatához bejelentkezés szükséges."
             android:textColor="@color/black"
             android:paddingTop="10dp"
             android:textSize="17sp"

filcnaplo/assets/fonts/Montserrat/OFL.txt

@@ -1,93 +0,0 @@
-Copyright 2011 The Montserrat Project Authors (https://github.com/JulietaUla/Montserrat)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

filcnaplo/ios/.gitignore

@@ -1,33 +0,0 @@
-*.mode1v3
-*.mode2v3
-*.moved-aside
-*.pbxuser
-*.perspectivev3
-**/*sync/
-.sconsign.dblite
-.tags*
-**/.vagrant/
-**/DerivedData/
-Icon?
-**/Pods/
-**/.symlinks/
-profile
-xcuserdata
-**/.generated/
-Flutter/App.framework
-Flutter/Flutter.framework
-Flutter/Flutter.podspec
-Flutter/Generated.xcconfig
-Flutter/ephemeral/
-Flutter/app.flx
-Flutter/app.zip
-Flutter/flutter_assets/
-Flutter/flutter_export_environment.sh
-ServiceDefinitions.json
-Runner/GeneratedPluginRegistrant.*
-
-# Exceptions to above rules.
-!default.mode1v3
-!default.mode2v3
-!default.pbxuser
-!default.perspectivev3

filcnaplo/ios/Flutter/Generated 2.xcconfig

@@ -1,15 +0,0 @@
-// This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/Users/kima/development/flutter
-FLUTTER_APPLICATION_PATH=/Users/kima/Documents/refilc/app/naplo/filcnaplo
-COCOAPODS_PARALLEL_CODE_SIGN=true
-FLUTTER_TARGET=/Users/kima/Documents/refilc/app/naplo/filcnaplo/lib/main.dart
-FLUTTER_BUILD_DIR=build
-FLUTTER_BUILD_NAME=3.5.1
-FLUTTER_BUILD_NUMBER=197
-EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
-EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
-DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==,RkxVVFRFUl9XRUJfQ0FOVkFTS0lUX1VSTD1odHRwczovL3d3dy5nc3RhdGljLmNvbS9mbHV0dGVyLWNhbnZhc2tpdC9iNGZiMTEyMTRkZDJkZGE2Y2UwMTJkZDk4ZWE0OThlOWU4YjkxMjYyLw==
-DART_OBFUSCATION=false
-TRACK_WIDGET_CREATION=true
-TREE_SHAKE_ICONS=false
-PACKAGE_CONFIG=/Users/kima/Documents/refilc/app/naplo/filcnaplo/.dart_tool/package_config.json

filcnaplo/ios/Flutter/Generated 3.xcconfig

@@ -1,15 +0,0 @@
-// This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/Users/kima/development/flutter
-FLUTTER_APPLICATION_PATH=/Users/kima/Documents/refilc/app/naplo/filcnaplo
-COCOAPODS_PARALLEL_CODE_SIGN=true
-FLUTTER_TARGET=/Users/kima/Documents/refilc/app/naplo/filcnaplo/lib/main.dart
-FLUTTER_BUILD_DIR=build
-FLUTTER_BUILD_NAME=4.1.0
-FLUTTER_BUILD_NUMBER=213
-EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
-EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
-DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==,RkxVVFRFUl9XRUJfQ0FOVkFTS0lUX1VSTD1odHRwczovL3d3dy5nc3RhdGljLmNvbS9mbHV0dGVyLWNhbnZhc2tpdC8yYTM0MDFjOWJiYjVhOWE5YWVjNzRkNGY3MzVkMThhOWRkM2ViZjJkLw==
-DART_OBFUSCATION=false
-TRACK_WIDGET_CREATION=true
-TREE_SHAKE_ICONS=false
-PACKAGE_CONFIG=/Users/kima/Documents/refilc/app/naplo/filcnaplo/.dart_tool/package_config.json

filcnaplo/ios/Flutter/Generated 4.xcconfig

@@ -1,15 +0,0 @@
-// This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/Users/kima/src/flutter
-FLUTTER_APPLICATION_PATH=/Users/kima/Documents/refilc/app/naplo/filcnaplo
-COCOAPODS_PARALLEL_CODE_SIGN=true
-FLUTTER_TARGET=/Users/kima/Documents/refilc/app/naplo/filcnaplo/lib/main.dart
-FLUTTER_BUILD_DIR=build
-FLUTTER_BUILD_NAME=4.1.1
-FLUTTER_BUILD_NUMBER=216
-EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
-EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
-DART_DEFINES=QVBQVkVSPTQuMS4x,RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==,RkxVVFRFUl9XRUJfQ0FOVkFTS0lUX1VSTD1odHRwczovL3d3dy5nc3RhdGljLmNvbS9mbHV0dGVyLWNhbnZhc2tpdC9jZGJlZGE3ODhhMjkzZmEyOTY2NWRjM2ZhM2Q2ZTYzYmQyMjFjYjBkLw==
-DART_OBFUSCATION=false
-TRACK_WIDGET_CREATION=true
-TREE_SHAKE_ICONS=false
-PACKAGE_CONFIG=/Users/kima/Documents/refilc/app/naplo/filcnaplo/.dart_tool/package_config.json

filcnaplo/ios/Flutter/Generated 5.xcconfig

@@ -1,14 +0,0 @@
-// This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=/Users/kima/src/flutter
-FLUTTER_APPLICATION_PATH=/Users/kima/Documents/refilc/app/naplo/filcnaplo
-COCOAPODS_PARALLEL_CODE_SIGN=true
-FLUTTER_TARGET=lib/main.dart
-FLUTTER_BUILD_DIR=build
-FLUTTER_BUILD_NAME=4.2.0
-FLUTTER_BUILD_NUMBER=220
-EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
-EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
-DART_OBFUSCATION=false
-TRACK_WIDGET_CREATION=true
-TREE_SHAKE_ICONS=false
-PACKAGE_CONFIG=.dart_tool/package_config.json

filcnaplo/ios/Flutter/flutter_export_environment 2.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-# This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/kima/development/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/kima/Documents/refilc/app/naplo/filcnaplo"
-export "COCOAPODS_PARALLEL_CODE_SIGN=true"
-export "FLUTTER_TARGET=/Users/kima/Documents/refilc/app/naplo/filcnaplo/lib/main.dart"
-export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=4.1.0"
-export "FLUTTER_BUILD_NUMBER=213"
-export "DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==,RkxVVFRFUl9XRUJfQ0FOVkFTS0lUX1VSTD1odHRwczovL3d3dy5nc3RhdGljLmNvbS9mbHV0dGVyLWNhbnZhc2tpdC8yYTM0MDFjOWJiYjVhOWE5YWVjNzRkNGY3MzVkMThhOWRkM2ViZjJkLw=="
-export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=true"
-export "TREE_SHAKE_ICONS=false"
-export "PACKAGE_CONFIG=/Users/kima/Documents/refilc/app/naplo/filcnaplo/.dart_tool/package_config.json"

filcnaplo/ios/Flutter/flutter_export_environment 3.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-# This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/kima/src/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/kima/Documents/refilc/app/naplo/filcnaplo"
-export "COCOAPODS_PARALLEL_CODE_SIGN=true"
-export "FLUTTER_TARGET=lib/main.dart"
-export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=4.2.0"
-export "FLUTTER_BUILD_NUMBER=220"
-export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=true"
-export "TREE_SHAKE_ICONS=false"
-export "PACKAGE_CONFIG=.dart_tool/package_config.json"

filcnaplo/ios/Flutter/flutter_export_environment 5.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-# This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/kima/src/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/kima/Documents/refilc/app/naplo/filcnaplo"
-export "COCOAPODS_PARALLEL_CODE_SIGN=true"
-export "FLUTTER_TARGET=lib/main.dart"
-export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=4.2.0"
-export "FLUTTER_BUILD_NUMBER=220"
-export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=true"
-export "TREE_SHAKE_ICONS=false"
-export "PACKAGE_CONFIG=.dart_tool/package_config.json"

filcnaplo/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -39,5 +39,8 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+    target.build_configurations.each do |config|
+      config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
+    end
   end
 end

filcnaplo/ios/Runner.xcodeproj/project.pbxproj

@@ -221,9 +221,9 @@
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
+				3127F74F28EAEC8A00C2EFB3 /* Embed Foundation Extensions */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				71459C0EB905E05018E3D78F /* [CP] Embed Pods Frameworks */,
-				3127F74F28EAEC8A00C2EFB3 /* Embed Foundation Extensions */,
 			);
 			buildRules = (
 			);
@@ -478,7 +478,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = 195;
-				DEVELOPMENT_TEAM = 48XS7JAZB7;
+				DEVELOPMENT_TEAM = 4DKAF249F3;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = reFilc;
@@ -488,7 +488,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 3.6.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -510,7 +510,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 48XS7JAZB7;
+				DEVELOPMENT_TEAM = 4DKAF249F3;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = livecard/Info.plist;
@@ -526,7 +526,7 @@
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo.livecardpro;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo.livecardpro;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -552,7 +552,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 48XS7JAZB7;
+				DEVELOPMENT_TEAM = 4DKAF249F3;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = livecard/Info.plist;
@@ -567,7 +567,7 @@
 				);
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo.livecardpro;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo.livecardpro;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -592,7 +592,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 48XS7JAZB7;
+				DEVELOPMENT_TEAM = 4DKAF249F3;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = livecard/Info.plist;
@@ -607,7 +607,7 @@
 				);
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo.livecardpro;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo.livecardpro;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -736,7 +736,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = 195;
-				DEVELOPMENT_TEAM = 48XS7JAZB7;
+				DEVELOPMENT_TEAM = 4DKAF249F3;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = reFilc;
@@ -746,7 +746,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 3.6.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -764,7 +764,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = 195;
-				DEVELOPMENT_TEAM = 48XS7JAZB7;
+				DEVELOPMENT_TEAM = 4DKAF249F3;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = reFilc;
@@ -774,7 +774,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 3.6.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc2.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

filcnaplo/ios/Runner/Runner.entitlements

@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.refilcnaplo.livecard</string>
+		<string>group.refilc2.livecard</string>
 	</array>
 </dict>
 </plist>

filcnaplo/ios/livecard/lesson_model.swift

@@ -14,7 +14,7 @@ class LessonData {
   var nextRoom: String
     
   init?() {
-    let sharedDefault = UserDefaults(suiteName: "group.refilc.livecard")!
+    let sharedDefault = UserDefaults(suiteName: "group.refilc2.livecard")!
       
     self.color = sharedDefault.string(forKey: "color")!
     self.icon = sharedDefault.string(forKey: "icon")!

filcnaplo/ios/livecard/livecard.entitlements

@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.refilcnaplo.livecard</string>
+		<string>group.refilc2.livecard</string>
 	</array>
 </dict>
 </plist>

filcnaplo/ios/livecard/livecard.swift

@@ -91,14 +91,15 @@ struct LockScreenLiveActivityView: View {
       Text(timerInterval: lesson!.date, countsDown: true)
           .multilineTextAlignment(.center)
           .frame(width: 85)
-          .font(.title)
+          .font(.title2)
           .monospacedDigit()
           .padding(.trailing, CGFloat(24))
     }
     .activityBackgroundTint(
-        lesson!.color == "#676767"
+        lesson!.color != "#676767"
-        ? nil
+        ? Color(hex: lesson!.color)
-        : Color(hex: lesson!.color)
+        // Ha nem megy hat nem megy
+        : Color.clear
     )
   }
 }
@@ -118,12 +119,22 @@ struct LiveCardWidget: Widget {
         DynamicIslandExpandedRegion(.leading) {
           VStack {
             Spacer()
-            Image(systemName: lesson!.icon)
+            ProgressView(
-              .resizable()
+              timerInterval: lesson!.date,
-              .aspectRatio(contentMode: .fit)
+              countsDown: true,
-              .frame(width: CGFloat(30), height: CGFloat(30))
+              label: {
-              .padding(.leading, CGFloat(6))
+                Image(systemName: lesson!.icon)
-              .padding(.bottom, CGFloat(6))
+                  .resizable()
+                  .aspectRatio(contentMode: .fit)
+                  .frame(width: CGFloat(32), height: CGFloat(32))
+              },
+              currentValueLabel: {
+                Image(systemName: lesson!.icon)
+                  .resizable()
+                  .aspectRatio(contentMode: .fit)
+                  .frame(width: CGFloat(32), height: CGFloat(32))
+              }
+            ).progressViewStyle(.circular)
           }
         }
         DynamicIslandExpandedRegion(.center) {
@@ -136,7 +147,7 @@ struct LiveCardWidget: Widget {
             Text(lesson!.description)
               .lineLimit(2)
               .font(.caption)
-          }
+          }.padding(EdgeInsets(top: 0.0, leading: 5.0, bottom: 0.0, trailing: 0.0))
         }
         DynamicIslandExpandedRegion(.trailing) {
           VStack {
@@ -156,7 +167,8 @@ struct LiveCardWidget: Widget {
           Image(systemName: lesson!.icon)
         }
         .font(.caption2)
-      } compactTrailing: {
+      }
+    compactTrailing: {
           Text(timerInterval: lesson!.date, countsDown: true)
             .multilineTextAlignment(.center)
             .frame(width: 40)
@@ -164,22 +176,29 @@ struct LiveCardWidget: Widget {
 
       /// Collapsed
       } minimal: {
-        VStack(alignment: .center) {
+        VStack(alignment: .center, content: {
-          Image(systemName: lesson!.icon)
+          ProgressView(
-            .resizable()
+            timerInterval: lesson!.date,
-            .aspectRatio(contentMode: .fit)
+            countsDown: true,
-            .frame(width: CGFloat(12), height: CGFloat(12))
+            label: {
-
+              Image(systemName: lesson!.icon)
-          Text(timerInterval: lesson!.date, countsDown: true)
+                .resizable()
-            .multilineTextAlignment(.center)
+                .aspectRatio(contentMode: .fit)
-            .monospacedDigit()
+                .frame(width: CGFloat(12), height: CGFloat(12))
-            .font(.system(size: CGFloat(10)))
+            },
-        }
+            currentValueLabel: {
+              Image(systemName: lesson!.icon)
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+                .frame(width: CGFloat(12), height: CGFloat(12))
+            }
+          ).progressViewStyle(.circular)
+        })
       }
       .keylineTint(
-        lesson!.color == "#676767"
+        lesson!.color != "#676767"
-        ? nil
+        ? Color(hex: lesson!.color)
-        : Color(hex: lesson!.color)
+        : Color.clear
       )
     }
   }

filcnaplo/lib/api/client.dart

@@ -1,10 +1,13 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:developer';
 
+import 'package:filcnaplo/models/ad.dart';
 import 'package:filcnaplo/models/config.dart';
 import 'package:filcnaplo/models/news.dart';
 import 'package:filcnaplo/models/release.dart';
 import 'package:filcnaplo/models/settings.dart';
+import 'package:filcnaplo/models/shared_theme.dart';
 import 'package:filcnaplo/models/supporter.dart';
 import 'package:filcnaplo_kreta_api/models/school.dart';
 import 'package:flutter/foundation.dart';
@@ -12,14 +15,18 @@ import 'package:http/http.dart' as http;
 import 'package:connectivity_plus/connectivity_plus.dart';
 
 class FilcAPI {
+  // API base
+  static const baseUrl = "https://api.refilc.hu";
+
   // Public API
-  static const schoolList = "https://api.refilc.hu/v1/public/school-list";
+  static const schoolList = "$baseUrl/v1/public/school-list";
-  static const news = "https://api.refilc.hu/v1/public/news";
+  static const news = "$baseUrl/v1/public/news";
-  static const supporters = "https://api.refilc.hu/v1/public/supporters";
+  static const supporters = "$baseUrl/v1/public/supporters";
 
   // Private API
-  static const config = "https://api.refilc.hu/v1/private/config";
+  static const ads = "$baseUrl/v1/private/ads";
-  static const reportApi = "https://api.refilc.hu/v1/private/crash-report";
+  static const config = "$baseUrl/v1/private/config";
+  static const reportApi = "$baseUrl/v1/private/crash-report";
   static const premiumApi = "https://api.filcnaplo.hu/premium/activate";
   // static const premiumScopesApi = "https://api.filcnaplo.hu/premium/scopes";
 
@@ -27,6 +34,17 @@ class FilcAPI {
   static const repo = "refilc/naplo";
   static const releases = "https://api.github.com/repos/$repo/releases";
 
+  // Share API
+  static const themeShare = "$baseUrl/v2/shared/theme/add";
+  static const themeGet = "$baseUrl/v2/shared/theme/get";
+  static const allThemes = "$themeGet/all";
+  static const themeByID = "$themeGet/";
+
+  static const gradeColorsShare = "$baseUrl/v2/shared/grade-colors/add";
+  static const gradeColorsGet = "$baseUrl/v2/shared/grade-colors/get";
+  static const allGradeColors = "$gradeColorsGet/all";
+  static const gradeColorsByID = "$gradeColorsGet/";
+
   static Future<bool> checkConnectivity() async =>
       (await Connectivity().checkConnectivity()) != ConnectivityResult.none;
 
@@ -40,9 +58,14 @@ class FilcAPI {
             .map((json) => School.fromJson(json))
             .toList();
         schools.add(School(
-          city: "Tiszabura",
+          city: "Stockholm",
-          instituteCode: "supporttest-reni-tiszabura-teszt01",
+          instituteCode: "refilc-test-sweden",
-          name: "FILC Éles Reni tiszabura-teszt",
+          name: "reFilc Test SE - Leo Ekström High School",
+        ));
+        schools.add(School(
+          city: "Madrid",
+          instituteCode: "refilc-test-spain",
+          name: "reFilc Test ES - Emilio Obrero University",
         ));
         return schools;
       } else {
@@ -117,6 +140,24 @@ class FilcAPI {
     return null;
   }
 
+  static Future<List<Ad>?> getAds() async {
+    try {
+      http.Response res = await http.get(Uri.parse(ads));
+
+      if (res.statusCode == 200) {
+        return (jsonDecode(res.body) as List)
+            .cast<Map>()
+            .map((e) => Ad.fromJson(e))
+            .toList();
+      } else {
+        throw "HTTP ${res.statusCode}: ${res.body}";
+      }
+    } on Exception catch (error, stacktrace) {
+      log("ERROR: FilcAPI.getAds: $error $stacktrace");
+    }
+    return null;
+  }
+
   static Future<List<Release>?> getReleases() async {
     try {
       http.Response res = await http.get(Uri.parse(releases));
@@ -149,12 +190,22 @@ class FilcAPI {
 
   static Future<void> sendReport(ErrorReport report) async {
     try {
-      http.Response res = await http.post(Uri.parse(reportApi), body: {
+      Map body = {
         "os": report.os,
         "version": report.version,
         "error": report.error,
         "stack_trace": report.stack,
-      });
+      };
+
+      var client = http.Client();
+
+      http.Response res = await client.post(
+        Uri.parse(reportApi),
+        body: body,
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+        },
+      );
 
       if (res.statusCode != 200) {
         throw "HTTP ${res.statusCode}: ${res.body}";
@@ -163,6 +214,93 @@ class FilcAPI {
       log("ERROR: FilcAPI.sendReport: $error $stacktrace");
     }
   }
+
+  // sharing
+  static Future<void> addSharedTheme(SharedTheme theme) async {
+    try {
+      theme.json.remove('json');
+      theme.json['is_public'] = theme.isPublic.toString();
+      theme.json['background_color'] = theme.backgroundColor.value.toString();
+      theme.json['panels_color'] = theme.panelsColor.value.toString();
+      theme.json['accent_color'] = theme.accentColor.value.toString();
+      theme.json['icon_color'] = theme.iconColor.value.toString();
+      theme.json['shadow_effect'] = theme.shadowEffect.toString();
+
+      // set linked grade colors
+      theme.json['grade_colors_id'] = theme.gradeColors.id;
+
+      http.Response res = await http.post(
+        Uri.parse(themeShare),
+        body: theme.json,
+        headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+      );
+
+      if (res.statusCode != 201) {
+        throw "HTTP ${res.statusCode}: ${res.body}";
+      }
+
+      log('Shared theme successfully with ID: ${theme.id}');
+    } on Exception catch (error, stacktrace) {
+      log("ERROR: FilcAPI.addSharedTheme: $error $stacktrace");
+    }
+  }
+
+  static Future<Map?> getSharedTheme(String id) async {
+    try {
+      http.Response res = await http.get(Uri.parse(themeByID + id));
+
+      if (res.statusCode == 200) {
+        return (jsonDecode(res.body) as Map);
+      } else {
+        throw "HTTP ${res.statusCode}: ${res.body}";
+      }
+    } on Exception catch (error, stacktrace) {
+      log("ERROR: FilcAPI.getSharedTheme: $error $stacktrace");
+    }
+    return null;
+  }
+
+  static Future<void> addSharedGradeColors(
+      SharedGradeColors gradeColors) async {
+    try {
+      gradeColors.json.remove('json');
+      gradeColors.json['is_public'] = gradeColors.isPublic.toString();
+      gradeColors.json['five_color'] = gradeColors.fiveColor.value.toString();
+      gradeColors.json['four_color'] = gradeColors.fourColor.value.toString();
+      gradeColors.json['three_color'] = gradeColors.threeColor.value.toString();
+      gradeColors.json['two_color'] = gradeColors.twoColor.value.toString();
+      gradeColors.json['one_color'] = gradeColors.oneColor.value.toString();
+
+      http.Response res = await http.post(
+        Uri.parse(gradeColorsShare),
+        body: gradeColors.json,
+        headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+      );
+
+      if (res.statusCode != 201) {
+        throw "HTTP ${res.statusCode}: ${res.body}";
+      }
+
+      log('Shared grade colors successfully with ID: ${gradeColors.id}');
+    } on Exception catch (error, stacktrace) {
+      log("ERROR: FilcAPI.addSharedGradeColors: $error $stacktrace");
+    }
+  }
+
+  static Future<Map?> getSharedGradeColors(String id) async {
+    try {
+      http.Response res = await http.get(Uri.parse(gradeColorsByID + id));
+
+      if (res.statusCode == 200) {
+        return (jsonDecode(res.body) as Map);
+      } else {
+        throw "HTTP ${res.statusCode}: ${res.body}";
+      }
+    } on Exception catch (error, stacktrace) {
+      log("ERROR: FilcAPI.getSharedGradeColors: $error $stacktrace");
+    }
+    return null;
+  }
 }
 
 class ErrorReport {

filcnaplo/lib/api/login.dart

@@ -1,6 +1,7 @@
 // ignore_for_file: avoid_print, use_build_context_synchronously
 
 import 'package:filcnaplo/utils/jwt.dart';
+import 'package:filcnaplo_kreta_api/models/school.dart';
 import 'package:filcnaplo_kreta_api/providers/absence_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/event_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/exam_provider.dart';
@@ -20,6 +21,7 @@ import 'package:filcnaplo_kreta_api/models/week.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:filcnaplo/api/nonce.dart';
+import 'package:uuid/uuid.dart';
 
 enum LoginState {
   missingFields,
@@ -47,87 +49,141 @@ Future loginAPI({
   void Function(User)? onLogin,
   void Function()? onSuccess,
 }) async {
-  Provider.of<KretaClient>(context, listen: false).userAgent =
+  Future testLogin(School school) async {
-      Provider.of<SettingsProvider>(context, listen: false).config.userAgent;
+    var user = User(
+      username: username,
+      password: password,
+      instituteCode: instituteCode,
+      name: 'Teszt Lajos',
+      student: Student(
+        birth: DateTime.now(),
+        id: const Uuid().v4(),
+        name: 'Teszt Lajos',
+        school: school,
+        yearId: '1',
+        parents: ['Teszt András', 'Teszt Linda'],
+        json: {"a": "b"},
+        address: '1117 Budapest, Gábor Dénes utca 4.',
+      ),
+      role: Role.parent,
+    );
 
-  Map<String, String> headers = {
+    if (onLogin != null) onLogin(user);
-    "content-type": "application/x-www-form-urlencoded",
-  };
 
-  String nonceStr = await Provider.of<KretaClient>(context, listen: false)
+    // store test user in db
-      .getAPI(KretaAPI.nonce, json: false);
+    await Provider.of<DatabaseProvider>(context, listen: false)
+        .store
+        .storeUser(user);
+    Provider.of<UserProvider>(context, listen: false).addUser(user);
+    Provider.of<UserProvider>(context, listen: false).setUser(user.id);
 
-  Nonce nonce = getNonce(nonceStr, username, instituteCode);
+    if (onSuccess != null) onSuccess();
-  headers.addAll(nonce.header());
 
-  Map? res = await Provider.of<KretaClient>(context, listen: false)
+    return LoginState.success;
-      .postAPI(KretaAPI.login,
+  }
-          headers: headers,
-          body: User.loginBody(
-            username: username,
-            password: password,
-            instituteCode: instituteCode,
-          ));
-  if (res != null) {
-    if (res.containsKey("error")) {
-      if (res["error"] == "invalid_grant") {
-        return LoginState.invalidGrant;
-      }
-    } else {
-      if (res.containsKey("access_token")) {
-        try {
-          Provider.of<KretaClient>(context, listen: false).accessToken =
-              res["access_token"];
-          Map? studentJson =
-              await Provider.of<KretaClient>(context, listen: false)
-                  .getAPI(KretaAPI.student(instituteCode));
-          Student student = Student.fromJson(studentJson!);
-          var user = User(
-            username: username,
-            password: password,
-            instituteCode: instituteCode,
-            name: student.name,
-            student: student,
-            role: JwtUtils.getRoleFromJWT(res["access_token"])!,
-          );
 
-          if (onLogin != null) onLogin(user);
+  // if institute matches one of test things do test login
+  if (instituteCode == 'refilc-test-sweden') {
+    School school = School(
+      city: "Stockholm",
+      instituteCode: "refilc-test-sweden",
+      name: "reFilc Test SE - Leo Ekström High School",
+    );
 
-          // Store User in the database
+    await testLogin(school);
-          await Provider.of<DatabaseProvider>(context, listen: false)
+  } else if (instituteCode == 'refilc-test-spain') {
-              .store
+    School school = School(
-              .storeUser(user);
+      city: "Madrid",
-          Provider.of<UserProvider>(context, listen: false).addUser(user);
+      instituteCode: "refilc-test-spain",
-          Provider.of<UserProvider>(context, listen: false).setUser(user.id);
+      name: "reFilc Test ES - Emilio Obrero University",
+    );
 
-          // Get user data
+    await testLogin(school);
-          // try {
+  } else {
-          await Future.wait([
+    // normal login from here
-            Provider.of<GradeProvider>(context, listen: false).fetch(),
+    Provider.of<KretaClient>(context, listen: false).userAgent =
-            Provider.of<TimetableProvider>(context, listen: false)
+        Provider.of<SettingsProvider>(context, listen: false).config.userAgent;
-                .fetch(week: Week.current()),
-            Provider.of<ExamProvider>(context, listen: false).fetch(),
-            Provider.of<HomeworkProvider>(context, listen: false).fetch(),
-            Provider.of<MessageProvider>(context, listen: false).fetchAll(),
-            Provider.of<NoteProvider>(context, listen: false).fetch(),
-            Provider.of<EventProvider>(context, listen: false).fetch(),
-            Provider.of<AbsenceProvider>(context, listen: false).fetch(),
-          ]);
-          // } catch (error) {
-          //   print("WARNING: failed to fetch user data: $error");
-          // }
 
-          if (onSuccess != null) onSuccess();
+    Map<String, String> headers = {
+      "content-type": "application/x-www-form-urlencoded",
+    };
 
-          return LoginState.success;
+    String nonceStr = await Provider.of<KretaClient>(context, listen: false)
-        } catch (error) {
+        .getAPI(KretaAPI.nonce, json: false);
-          print("ERROR: loginAPI: $error");
+
-          // maybe check debug mode
+    Nonce nonce = getNonce(nonceStr, username, instituteCode);
-          // ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("ERROR: $error")));
+    headers.addAll(nonce.header());
-          return LoginState.failed;
+
+    Map? res = await Provider.of<KretaClient>(context, listen: false)
+        .postAPI(KretaAPI.login,
+            headers: headers,
+            body: User.loginBody(
+              username: username,
+              password: password,
+              instituteCode: instituteCode,
+            ));
+    if (res != null) {
+      if (res.containsKey("error")) {
+        if (res["error"] == "invalid_grant") {
+          return LoginState.invalidGrant;
+        }
+      } else {
+        if (res.containsKey("access_token")) {
+          try {
+            Provider.of<KretaClient>(context, listen: false).accessToken =
+                res["access_token"];
+            Map? studentJson =
+                await Provider.of<KretaClient>(context, listen: false)
+                    .getAPI(KretaAPI.student(instituteCode));
+            Student student = Student.fromJson(studentJson!);
+            var user = User(
+              username: username,
+              password: password,
+              instituteCode: instituteCode,
+              name: student.name,
+              student: student,
+              role: JwtUtils.getRoleFromJWT(res["access_token"])!,
+            );
+
+            if (onLogin != null) onLogin(user);
+
+            // Store User in the database
+            await Provider.of<DatabaseProvider>(context, listen: false)
+                .store
+                .storeUser(user);
+            Provider.of<UserProvider>(context, listen: false).addUser(user);
+            Provider.of<UserProvider>(context, listen: false).setUser(user.id);
+
+            // Get user data
+            try {
+              await Future.wait([
+                Provider.of<GradeProvider>(context, listen: false).fetch(),
+                Provider.of<TimetableProvider>(context, listen: false)
+                    .fetch(week: Week.current()),
+                Provider.of<ExamProvider>(context, listen: false).fetch(),
+                Provider.of<HomeworkProvider>(context, listen: false).fetch(),
+                Provider.of<MessageProvider>(context, listen: false).fetchAll(),
+                Provider.of<NoteProvider>(context, listen: false).fetch(),
+                Provider.of<EventProvider>(context, listen: false).fetch(),
+                Provider.of<AbsenceProvider>(context, listen: false).fetch(),
+              ]);
+            } catch (error) {
+              print("WARNING: failed to fetch user data: $error");
+            }
+
+            if (onSuccess != null) onSuccess();
+
+            return LoginState.success;
+          } catch (error) {
+            print("ERROR: loginAPI: $error");
+            // maybe check debug mode
+            // ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("ERROR: $error")));
+            return LoginState.failed;
+          }
         }
       }
     }
   }
+
   return LoginState.failed;
 }

filcnaplo/lib/api/providers/ad_provider.dart

@@ -0,0 +1,29 @@
+import 'package:filcnaplo/api/client.dart';
+import 'package:filcnaplo/models/ad.dart';
+import 'package:flutter/material.dart';
+
+class AdProvider extends ChangeNotifier {
+  // private
+  late List<Ad> _ads;
+  bool get available => _ads.isNotEmpty;
+
+  // public
+  List<Ad> get ads => _ads;
+
+  AdProvider({
+    List<Ad> initialAds = const [],
+    required BuildContext context,
+  }) {
+    _ads = List.castFrom(initialAds);
+  }
+
+  Future<void> fetch() async {
+    _ads = await FilcAPI.getAds() ?? [];
+    _ads.sort((a, b) => -a.date.compareTo(b.date));
+
+    // check for new ads
+    if (_ads.isNotEmpty) {
+      notifyListeners();
+    }
+  }
+}

filcnaplo/lib/api/providers/live_card_provider.dart

@@ -51,24 +51,24 @@ class LiveCardProvider extends ChangeNotifier {
       _liveActivitiesPlugin.areActivitiesEnabled().then((value) {
         // Console log
         if (kDebugMode) {
-          print("Live card enabled: $value");
+          print("iOS LiveActivity enabled: $value");
         }
 
         if (value) {
-          _liveActivitiesPlugin.init(appGroupId: "group.refilc.livecard");
+          _liveActivitiesPlugin.init(appGroupId: "group.refilc2.livecard");
 
           _liveActivitiesPlugin.getAllActivitiesIds().then((value) {
             _latestActivityId = value.isNotEmpty ? value.first : null;
           });
         }
       });
-
-      _timer = Timer.periodic(const Duration(seconds: 1), (timer) => update());
-      _delay = settings.bellDelayEnabled
-          ? Duration(seconds: settings.bellDelay)
-          : Duration.zero;
-      update();
     }
+
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) => update());
+    _delay = settings.bellDelayEnabled
+        ? Duration(seconds: settings.bellDelay)
+        : Duration.zero;
+    update();
   }
 
   @override
@@ -88,7 +88,7 @@ class LiveCardProvider extends ChangeNotifier {
 
   // Debugging
   static DateTime _now() {
-    // return DateTime(2023, 8, 31, 8, 0);
+    // return DateTime(2023, 9, 27, 9, 30);
     return DateTime.now();
   }
 
@@ -120,7 +120,7 @@ class LiveCardProvider extends ChangeNotifier {
           "index":
               currentLesson != null ? '${currentLesson!.lessonIndex}. ' : "",
           "title": currentLesson != null
-              ? ShortSubject.resolve(subject: currentLesson?.subject).capital()
+              ? currentLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: currentLesson?.subject).capital()
               : "",
           "subtitle": currentLesson?.room.replaceAll("_", " ") ?? "",
           "description": currentLesson?.description ?? "",
@@ -131,7 +131,7 @@ class LiveCardProvider extends ChangeNotifier {
                   _delay.inMilliseconds)
               .toString(),
           "nextSubject": nextLesson != null
-              ? ShortSubject.resolve(subject: nextLesson?.subject).capital()
+              ? nextLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: nextLesson?.subject).capital()
               : "",
           "nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "",
         };
@@ -160,7 +160,7 @@ class LiveCardProvider extends ChangeNotifier {
                   _delay.inMilliseconds)
               .toString(),
           "nextSubject": (nextLesson != null
-                  ? ShortSubject.resolve(subject: nextLesson?.subject)
+                  ? nextLesson?.subject.renamedTo ?? ShortSubject.resolve(subject: nextLesson?.subject).capital()
                   : "")
               .capital(),
           "nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "",
@@ -196,7 +196,7 @@ class LiveCardProvider extends ChangeNotifier {
               }
             } catch (e) {
               if (kDebugMode) {
-                print('ERROR: Unable to create or update iOS LiveCard!');
+                print('ERROR: Unable to create or update iOS LiveActivity!');
               }
             }
           }

filcnaplo/lib/api/providers/status_provider.dart

@@ -1,8 +1,10 @@
+import 'dart:io';
+
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/widgets.dart';
 import 'package:http/http.dart' as http;
 
-enum Status { network, maintenance, syncing }
+enum Status { network, maintenance, syncing, apiError }
 
 class StatusProvider extends ChangeNotifier {
   final List<Status> _stack = [];
@@ -12,6 +14,7 @@ class StatusProvider extends ChangeNotifier {
 
   StatusProvider() {
     _handleNetworkChanges();
+    _handleDNSFailure();
     Connectivity().checkConnectivity().then((value) => _networkType = value);
   }
 
@@ -24,6 +27,7 @@ class StatusProvider extends ChangeNotifier {
       _networkType = event;
       if (event == ConnectivityResult.none) {
         if (!_stack.contains(Status.network)) {
+          _stack.remove(Status.apiError);
           _stack.insert(0, Status.network);
           notifyListeners();
         }
@@ -36,8 +40,34 @@ class StatusProvider extends ChangeNotifier {
     });
   }
 
+  void _handleDNSFailure() {
+    try {
+      InternetAddress.lookup('api.refilc.hu').then((status) {
+        if (status.isEmpty) {
+          if (!_stack.contains(Status.network)) {
+            _stack.remove(Status.apiError);
+            _stack.insert(0, Status.network);
+            notifyListeners();
+          }
+        } else {
+          if (_stack.contains(Status.network)) {
+            _stack.remove(Status.network);
+            notifyListeners();
+          }
+        }
+      });
+    } on SocketException catch (_) {
+      if (!_stack.contains(Status.network)) {
+        _stack.remove(Status.apiError);
+        _stack.insert(0, Status.network);
+        notifyListeners();
+      }
+    }
+  }
+
   void triggerRequest(http.Response res) {
-    if (res.headers.containsKey("x-maintenance-mode") || res.statusCode == 503) {
+    if (res.headers.containsKey("x-maintenance-mode") ||
+        res.statusCode == 503) {
       if (!_stack.contains(Status.maintenance)) {
         _stack.insert(0, Status.maintenance);
         notifyListeners();
@@ -48,6 +78,23 @@ class StatusProvider extends ChangeNotifier {
         notifyListeners();
       }
     }
+
+    if (res.body == 'invalid_grant' ||
+        res.body.replaceAll(' ', '') == '' ||
+        res.statusCode == 400) {
+      if (!_stack.contains(Status.apiError) &&
+          !_stack.contains(Status.network)) {
+        if (res.statusCode == 401) return;
+        _stack.insert(0, Status.apiError);
+        notifyListeners();
+      }
+    } else {
+      if (_stack.contains(Status.apiError) &&
+          res.request?.url.path != '/nonce') {
+        _stack.remove(Status.apiError);
+        notifyListeners();
+      }
+    }
   }
 
   void triggerSync({required int current, required int max}) {

filcnaplo/lib/api/providers/update_provider.dart

@@ -33,9 +33,12 @@ class UpdateProvider extends ChangeNotifier {
 
     // Check for new releases
     if (_releases.isNotEmpty) {
-      _available = _releases.first.version
+      if (!_releases.first.prerelease) {
-              .compareTo(Version.fromString(currentVersion)) ==
+        _available = _releases.first.version
-          1;
+                .compareTo(Version.fromString(currentVersion)) ==
+            1;
+      }
+
       // ignore: avoid_print
       if (_available) print("INFO: New update: ${releases.first.version}");
       notifyListeners();

filcnaplo/lib/app.dart

@@ -3,6 +3,7 @@ import 'dart:math';
 
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:filcnaplo/api/client.dart';
+import 'package:filcnaplo/api/providers/ad_provider.dart';
 import 'package:filcnaplo/api/providers/live_card_provider.dart';
 import 'package:filcnaplo/api/providers/news_provider.dart';
 import 'package:filcnaplo/api/providers/database_provider.dart';
@@ -13,6 +14,7 @@ import 'package:filcnaplo/theme/theme.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
 import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
 import 'package:filcnaplo_premium/providers/goal_provider.dart';
+import 'package:filcnaplo_premium/providers/share_provider.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -98,47 +100,79 @@ class App extends StatelessWidget {
         Provider<KretaClient>(create: (_) => kreta),
         Provider<DatabaseProvider>(create: (context) => database),
         ChangeNotifierProvider<ThemeModeObserver>(
-            create: (context) =>
+          create: (context) => ThemeModeObserver(
-                ThemeModeObserver(initialTheme: settings.theme)),
+            initialTheme: settings.theme,
+          ),
+        ),
         ChangeNotifierProvider<NewsProvider>(
-            create: (context) => NewsProvider(context: context)),
+          create: (context) => NewsProvider(context: context),
+        ),
         ChangeNotifierProvider<UpdateProvider>(
-            create: (context) => UpdateProvider(context: context)),
+          create: (context) => UpdateProvider(context: context),
+        ),
+        ChangeNotifierProvider<AdProvider>(
+          create: (context) => AdProvider(context: context),
+        ),
 
         // user data (kreten) providers
         ChangeNotifierProvider<GradeProvider>(
-            create: (_) => GradeProvider(
+          create: (_) => GradeProvider(
-                settings: settings,
+            settings: settings,
-                user: user,
+            user: user,
-                database: database,
+            database: database,
-                kreta: kreta)),
+            kreta: kreta,
+          ),
+        ),
         ChangeNotifierProvider<TimetableProvider>(create: (_) => timetable),
         ChangeNotifierProvider<ExamProvider>(
-            create: (context) => ExamProvider(context: context)),
+          create: (context) => ExamProvider(context: context),
+        ),
         ChangeNotifierProvider<HomeworkProvider>(
-            create: (context) =>
+          create: (context) => HomeworkProvider(
-                HomeworkProvider(context: context, database: database)),
+            context: context,
+            database: database,
+            user: user,
+          ),
+        ),
         ChangeNotifierProvider<MessageProvider>(
-            create: (context) => MessageProvider(context: context)),
+          create: (context) => MessageProvider(context: context),
+        ),
         ChangeNotifierProvider<NoteProvider>(
-            create: (context) => NoteProvider(context: context)),
+          create: (context) => NoteProvider(context: context),
+        ),
         ChangeNotifierProvider<EventProvider>(
-            create: (context) => EventProvider(context: context)),
+          create: (context) => EventProvider(context: context),
+        ),
         ChangeNotifierProvider<AbsenceProvider>(
-            create: (context) => AbsenceProvider(context: context)),
+          create: (context) => AbsenceProvider(context: context),
+        ),
 
         // other providers
         ChangeNotifierProvider<GradeCalculatorProvider>(
-            create: (_) => GradeCalculatorProvider(
+          create: (_) => GradeCalculatorProvider(
-                settings: settings,
+            settings: settings,
-                user: user,
+            user: user,
-                database: database,
+            database: database,
-                kreta: kreta)),
+            kreta: kreta,
+          ),
+        ),
         ChangeNotifierProvider<LiveCardProvider>(
-            create: (context) =>
+          create: (context) => LiveCardProvider(
-                LiveCardProvider(timetable: timetable, settings: settings)),
+            timetable: timetable,
+            settings: settings,
+          ),
+        ),
         ChangeNotifierProvider<GoalProvider>(
-            create: (context) => GoalProvider(database: database, user: user)),
+          create: (context) => GoalProvider(
+            database: database,
+            user: user,
+          ),
+        ),
+        ChangeNotifierProvider<ShareProvider>(
+          create: (context) => ShareProvider(
+            user: user,
+          ),
+        ),
       ],
       child: Consumer<ThemeModeObserver>(
         builder: (context, themeMode, child) {

filcnaplo/lib/database/init.dart

@@ -15,7 +15,8 @@ const settingsDB = DatabaseStruct("settings", {
   "accent_color": int, "news": int, "seen_news": String,
   "developer_mode": int,
   "update_channel": int, "config": String, "custom_accent_color": int,
-  "custom_background_color": int, "custom_highlight_color": int, // general
+  "custom_background_color": int, "custom_highlight_color": int,
+  "custom_icon_color": int, "shadow_effect": int, // general
   "grade_color1": int, "grade_color2": int, "grade_color3": int,
   "grade_color4": int, "grade_color5": int, // grade colors
   "vibration_strength": int, "ab_weeks": int, "swap_ab_weeks": int,
@@ -33,6 +34,7 @@ const settingsDB = DatabaseStruct("settings", {
   "renamed_subjects_italics": int, "renamed_teachers_enabled": int,
   "renamed_teachers_italics": int,
   "live_activity_color": String,
+  "welcome_message": String,
 });
 // DON'T FORGET TO UPDATE DEFAULT VALUES IN `initDB` MIGRATION OR ELSE PARENTS WILL COMPLAIN ABOUT THEIR CHILDREN MISSING
 // YOU'VE BEEN WARNED!!!

filcnaplo/lib/helpers/notification_helper.dart

@@ -195,7 +195,7 @@ class NotificationsHelper {
           if (userProvider.getUsers().length == 1) {
             await flutterLocalNotificationsPlugin.show(
               absence.id.hashCode,
-              "title_absence".i18n,
+              "title_absence".i18n, // https://discord.com/channels/1111649116020285532/1153273625206591528
               "body_absence".i18n.fill(
                 [
                   DateFormat("yyyy-MM-dd").format(absence.date),
@@ -210,7 +210,7 @@ class NotificationsHelper {
           } else {
             await flutterLocalNotificationsPlugin.show(
               absence.id.hashCode,
-              "title_absence".i18n,
+              "title_absence".i18n, // https://discord.com/channels/1111649116020285532/1153273625206591528
               "body_absence_multiuser".i18n.fill(
                 [
                   userProvider.displayName!,

filcnaplo/lib/helpers/storage_helper.dart

@@ -9,7 +9,7 @@ import 'package:permission_handler/permission_handler.dart';
 class StorageHelper {
   static Future<bool> write(String path, Uint8List data) async {
     try {
-      if (await Permission.storage.request().isGranted) {
+      if (await Permission.manageExternalStorage.request().isGranted) {
         await File(path).writeAsBytes(data);
         return true;
       } else {
@@ -34,5 +34,6 @@ class StorageHelper {
     }
 
     return downloads;
+    // return (await getTemporaryDirectory()).path;
   }
 }

filcnaplo/lib/helpers/subject.dart

@@ -22,7 +22,8 @@ class SubjectIconData {
   });
 }
 
-SubjectIconVariants createIcon({required IconData material, required IconData cupertino}) {
+SubjectIconVariants createIcon(
+    {required IconData material, required IconData cupertino}) {
   return {
     IconPack.material: material,
     IconPack.cupertino: cupertino,
@@ -30,82 +31,224 @@ SubjectIconVariants createIcon({required IconData material, required IconData cu
 }
 
 class SubjectIcon {
-  static String resolveName({Subject? subject, String? subjectName}) => _resolve(subject: subject, subjectName: subjectName).name;
+  static String resolveName({GradeSubject? subject, String? subjectName}) =>
-  static IconData resolveVariant({Subject? subject, String? subjectName, required BuildContext context}) =>
+      _resolve(subject: subject, subjectName: subjectName).name;
-      _resolve(subject: subject, subjectName: subjectName).data[Provider.of<SettingsProvider>(context, listen: false).iconPack]!;
+  static IconData resolveVariant(
+          {GradeSubject? subject,
+          String? subjectName,
+          required BuildContext context}) =>
+      _resolve(subject: subject, subjectName: subjectName).data[
+          Provider.of<SettingsProvider>(context, listen: false).iconPack]!;
 
-  static SubjectIconData _resolve({Subject? subject, String? subjectName}) {
+  static SubjectIconData _resolve(
+      {GradeSubject? subject, String? subjectName}) {
     assert(!(subject == null && subjectName == null));
 
-    String name = (subject?.name ?? subjectName ?? "").toLowerCase().specialChars().trim();
+    String name = (subject?.name ?? subjectName ?? "")
-    String category = subject?.category.description.toLowerCase().specialChars() ?? "";
+        .toLowerCase()
+        .specialChars()
+        .trim();
+    String category =
+        subject?.category.description.toLowerCase().specialChars() ?? "";
 
     // todo: check for categories
     if (RegExp("mate(k|matika)").hasMatch(name) || category == "matematika") {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.function, material: Icons.calculate_outlined), name: "function");
-    } else if (RegExp("magyar nyelv|nyelvtan").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.textformat_alt, material: Icons.spellcheck_outlined), name: "textformat.alt");
-    } else if (RegExp("irodalom").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.book, material: Icons.menu_book_outlined), name: "book");
-    } else if (RegExp("tor(i|tenelem)").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.compass, material: Icons.hourglass_empty_outlined), name: "safari");
-    } else if (RegExp("foldrajz").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.map, material: Icons.public_outlined), name: "map");
-    } else if (RegExp("rajz|muvtori|muveszet|vizualis").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.paintbrush, material: Icons.palette_outlined), name: "paintbrush");
-    } else if (RegExp("fizika").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.lightbulb, material: Icons.emoji_objects_outlined), name: "lightbulb");
-    } else if (RegExp("^enek|zene|szolfezs|zongora|korus").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.music_note, material: Icons.music_note_outlined), name: "music.note");
-    } else if (RegExp("^tes(i|tneveles)|sport").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.sportscourt, material: Icons.sports_soccer_outlined), name: "sportscourt");
-    } else if (RegExp("kemia").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.lab_flask, material: Icons.science_outlined), name: "testtube.2");
-    } else if (RegExp("biologia").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.paw, material: Icons.pets_outlined), name: "pawprint");
-    } else if (RegExp("kornyezet|termeszet ?(tudomany|ismeret)|hon( es nep)?ismeret").hasMatch(name)) {
       return SubjectIconData(
-          data: createIcon(cupertino: CupertinoIcons.arrow_3_trianglepath, material: Icons.eco_outlined), name: "arrow.3.trianglepath");
+          data: createIcon(
+              cupertino: CupertinoIcons.function,
+              material: Icons.calculate_outlined),
+          name: "function");
+    } else if (RegExp("magyar nyelv|nyelvtan").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.textformat_alt,
+              material: Icons.spellcheck_outlined),
+          name: "textformat.alt");
+    } else if (RegExp("irodalom").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.book,
+              material: Icons.menu_book_outlined),
+          name: "book");
+    } else if (RegExp("tor(i|tenelem)").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.compass,
+              material: Icons.hourglass_empty_outlined),
+          name: "safari");
+    } else if (RegExp("foldrajz").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.map, material: Icons.public_outlined),
+          name: "map");
+    } else if (RegExp("rajz|muvtori|muveszet|vizualis").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.paintbrush,
+              material: Icons.palette_outlined),
+          name: "paintbrush");
+    } else if (RegExp("fizika").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.lightbulb,
+              material: Icons.emoji_objects_outlined),
+          name: "lightbulb");
+    } else if (RegExp("^enek|zene|szolfezs|zongora|korus").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.music_note,
+              material: Icons.music_note_outlined),
+          name: "music.note");
+    } else if (RegExp("^tes(i|tneveles)|sport").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.sportscourt,
+              material: Icons.sports_soccer_outlined),
+          name: "sportscourt");
+    } else if (RegExp("kemia").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.lab_flask,
+              material: Icons.science_outlined),
+          name: "testtube.2");
+    } else if (RegExp("biologia").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.paw, material: Icons.pets_outlined),
+          name: "pawprint");
+    } else if (RegExp(
+            "kornyezet|termeszet ?(tudomany|ismeret)|hon( es nep)?ismeret")
+        .hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.arrow_3_trianglepath,
+              material: Icons.eco_outlined),
+          name: "arrow.3.trianglepath");
     } else if (RegExp("(hit|erkolcs)tan|vallas|etika").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.heart, material: Icons.favorite_border_outlined), name: "heart");
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.heart,
+              material: Icons.favorite_border_outlined),
+          name: "heart");
     } else if (RegExp("penzugy").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.money_dollar, material: Icons.savings_outlined), name: "dollarsign");
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.money_dollar,
+              material: Icons.savings_outlined),
+          name: "dollarsign");
     } else if (RegExp("informatika|szoftver|iroda|digitalis").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.device_laptop, material: Icons.computer_outlined), name: "laptopcomputer");
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.device_laptop,
+              material: Icons.computer_outlined),
+          name: "laptopcomputer");
     } else if (RegExp("prog").hasMatch(name)) {
       return SubjectIconData(
-          data: createIcon(cupertino: CupertinoIcons.chevron_left_slash_chevron_right, material: Icons.code_outlined),
+          data: createIcon(
+              cupertino: CupertinoIcons.chevron_left_slash_chevron_right,
+              material: Icons.code_outlined),
           name: "chevron.left.forwardslash.chevron.right");
     } else if (RegExp("halozat").hasMatch(name)) {
       return SubjectIconData(
-          data: createIcon(cupertino: CupertinoIcons.antenna_radiowaves_left_right, material: Icons.wifi_tethering_outlined),
+          data: createIcon(
+              cupertino: CupertinoIcons.antenna_radiowaves_left_right,
+              material: Icons.wifi_tethering_outlined),
           name: "antenna.radiowaves.left.and.right");
     } else if (RegExp("szinhaz").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.hifispeaker, material: Icons.theater_comedy_outlined), name: "hifispeaker");
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.hifispeaker,
+              material: Icons.theater_comedy_outlined),
+          name: "hifispeaker");
     } else if (RegExp("film|media").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.film, material: Icons.theaters_outlined), name: "film");
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.film,
+              material: Icons.theaters_outlined),
+          name: "film");
     } else if (RegExp("elektro(tech)?nika").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.bolt, material: Icons.electrical_services_outlined), name: "bolt");
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.bolt,
+              material: Icons.electrical_services_outlined),
+          name: "bolt");
     } else if (RegExp("gepesz|mernok|ipar").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.wrench, material: Icons.precision_manufacturing_outlined), name: "wrench");
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.wrench,
+              material: Icons.precision_manufacturing_outlined),
+          name: "wrench");
     } else if (RegExp("technika").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.hammer, material: Icons.build_outlined), name: "hammer");
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.hammer, material: Icons.build_outlined),
+          name: "hammer");
     } else if (RegExp("tanc").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.music_mic, material: Icons.speaker_outlined), name: "music.mic");
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.music_mic,
+              material: Icons.speaker_outlined),
+          name: "music.mic");
     } else if (RegExp("filozofia").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.bubble_left, material: Icons.psychology_outlined), name: "bubble.left");
+      return SubjectIconData(
-    } else if (RegExp("osztaly(fonoki|kozosseg)").hasMatch(name) || name == "ofo") {
+          data: createIcon(
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.group, material: Icons.groups_outlined), name: "person.3");
+              cupertino: CupertinoIcons.bubble_left,
+              material: Icons.psychology_outlined),
+          name: "bubble.left");
+    } else if (RegExp("osztaly(fonoki|kozosseg)").hasMatch(name) ||
+        name == "ofo") {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.group, material: Icons.groups_outlined),
+          name: "person.3");
     } else if (RegExp("gazdasag").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.chart_pie, material: Icons.account_balance_outlined), name: "chart.pie");
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.chart_pie,
+              material: Icons.account_balance_outlined),
+          name: "chart.pie");
     } else if (RegExp("szorgalom").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.checkmark_seal, material: Icons.verified_outlined), name: "checkmark.seal");
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.checkmark_seal,
+              material: Icons.verified_outlined),
+          name: "checkmark.seal");
     } else if (RegExp("magatartas").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.smiley, material: Icons.emoji_people_outlined), name: "face.smiling");
+      return SubjectIconData(
-    } else if (RegExp("angol|nemet|francia|olasz|orosz|spanyol|latin|kinai|nyelv").hasMatch(name)) {
+          data: createIcon(
-      return SubjectIconData(data: createIcon(cupertino: CupertinoIcons.globe, material: Icons.translate_outlined), name: "globe");
+              cupertino: CupertinoIcons.smiley,
+              material: Icons.emoji_people_outlined),
+          name: "face.smiling");
+    } else if (RegExp(
+            "angol|nemet|francia|olasz|orosz|spanyol|latin|kinai|nyelv")
+        .hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.globe,
+              material: Icons.translate_outlined),
+          name: "globe");
     } else if (RegExp("linux").hasMatch(name)) {
-      return SubjectIconData(data: createIcon(material: FilcIcons.linux, cupertino: FilcIcons.linux));
+      return SubjectIconData(
+          data: createIcon(
+              material: FilcIcons.linux, cupertino: FilcIcons.linux));
+    } else if (RegExp("adatbazis").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.table_badge_more,
+              material: Icons.table_chart),
+          name: "table.badge.more");
+    } else if (RegExp("asztali alkalmazasok").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.macwindow,
+              material: Icons.desktop_windows_outlined),
+          name: "macwindow");
+    } else if (RegExp("projekt").hasMatch(name)) {
+      return SubjectIconData(
+          data: createIcon(
+              cupertino: CupertinoIcons.person_3_fill,
+              material: Icons.groups_3),
+          name: "person.3.fill");
     }
 
     return SubjectIconData();
@@ -113,10 +256,13 @@ class SubjectIcon {
 }
 
 class ShortSubject {
-  static String resolve({Subject? subject, String? subjectName}) {
+  static String resolve({GradeSubject? subject, String? subjectName}) {
     assert(!(subject == null && subjectName == null));
 
-    String name = (subject?.name ?? subjectName ?? "").toLowerCase().specialChars().trim();
+    String name = (subject?.name ?? subjectName ?? "")
+        .toLowerCase()
+        .specialChars()
+        .trim();
     // String category = subject?.category.description.toLowerCase().specialChars() ?? "";
 
     if (RegExp("magyar irodalom").hasMatch(name)) {
@@ -131,7 +277,9 @@ class ShortSubject {
       return "Tesi";
     } else if (RegExp("tortenelem").hasMatch(name)) {
       return "Töri";
-    } else if (RegExp("(angol|nemet|francia|olasz|orosz|spanyol|latin|kinai) nyelv").hasMatch(name)) {
+    } else if (RegExp(
+            "(angol|nemet|francia|olasz|orosz|spanyol|latin|kinai) nyelv")
+        .hasMatch(name)) {
       return (subject?.name ?? subjectName ?? "?").replaceAll(" nyelv", "");
     } else if (RegExp("informatika").hasMatch(name)) {
       return "Infó";

filcnaplo/lib/helpers/update_helper.dart

@@ -33,10 +33,10 @@ extension UpdateHelper on Release {
 
     updateCallback(-1, UpdateState.installing);
 
-    var permStatus =
+    var installPerms =
         (await Permission.manageExternalStorage.request().isGranted &&
             await Permission.requestInstallPackages.request().isGranted);
-    if (permStatus) {
+    if (installPerms) {
       var result = await OpenFile.open(apk.path);
 
       if (result.type != ResultType.done) {

filcnaplo/lib/models/ad.dart

@@ -0,0 +1,37 @@
+class Ad {
+  String title;
+  String description;
+  String author;
+  Uri? logoUrl;
+  bool overridePremium;
+  DateTime date;
+  DateTime expireDate;
+  Uri launchUrl;
+
+  Ad({
+    required this.title,
+    required this.description,
+    required this.author,
+    this.logoUrl,
+    this.overridePremium = false,
+    required this.date,
+    required this.expireDate,
+    required this.launchUrl,
+  });
+
+  factory Ad.fromJson(Map json) {
+    return Ad(
+      title: json['title'] ?? 'Ad',
+      description: json['description'] ?? '',
+      author: json['author'] ?? 'reFilc',
+      logoUrl: json['logo_url'] != null ? Uri.parse(json['logo_url']) : null,
+      overridePremium: json['override_premium'] ?? false,
+      date:
+          json['date'] != null ? DateTime.parse(json['date']) : DateTime.now(),
+      expireDate: json['expire_date'] != null
+          ? DateTime.parse(json['expire_date'])
+          : DateTime.now(),
+      launchUrl: Uri.parse(json['launch_url'] ?? 'https://refilc.hu'),
+    );
+  }
+}

filcnaplo/lib/models/config.dart

@@ -3,18 +3,22 @@ import 'dart:io';
 class Config {
   String _userAgent;
   Map? json;
-  static const String _version = String.fromEnvironment("APPVER", defaultValue: "2.2.0");
+  static const String _version =
+      String.fromEnvironment("APPVER", defaultValue: "3.0.4");
 
   Config({required String userAgent, this.json}) : _userAgent = userAgent;
 
   factory Config.fromJson(Map json) {
     return Config(
-      userAgent: json["user_agent"] ?? "hu.refilc.naplo/\$0/\$1/\$2",
+      userAgent: json["user_agent"] ?? "hu.ekreta.student/\$0/\$1/\$2",
       json: json,
     );
   }
 
-  String get userAgent => _userAgent.replaceAll("\$0", _version).replaceAll("\$1", platform).replaceAll("\$2", "0");
+  String get userAgent => _userAgent
+      .replaceAll("\$0", _version)
+      .replaceAll("\$1", platform)
+      .replaceAll("\$2", "0");
 
   static String get platform {
     if (Platform.isAndroid) {

filcnaplo/lib/models/settings.dart

@@ -67,6 +67,8 @@ class SettingsProvider extends ChangeNotifier {
   Color _customAccentColor;
   Color _customBackgroundColor;
   Color _customHighlightColor;
+  Color _customIconColor;
+  bool _shadowEffect;
   List<String> _premiumScopes;
   String _premiumAccessToken;
   String _premiumLogin;
@@ -76,6 +78,7 @@ class SettingsProvider extends ChangeNotifier {
   bool _renamedTeachersEnabled;
   bool _renamedTeachersItalics;
   Color _liveActivityColor;
+  String _welcomeMessage;
 
   SettingsProvider({
     DatabaseProvider? database,
@@ -111,6 +114,8 @@ class SettingsProvider extends ChangeNotifier {
     required Color customAccentColor,
     required Color customBackgroundColor,
     required Color customHighlightColor,
+    required Color customIconColor,
+    required bool shadowEffect,
     required List<String> premiumScopes,
     required String premiumAccessToken,
     required String premiumLogin,
@@ -120,6 +125,7 @@ class SettingsProvider extends ChangeNotifier {
     required bool renameTeachersEnabled,
     required bool renameTeachersItalics,
     required Color liveActivityColor,
+    required String welcomeMessage,
   })  : _database = database,
         _language = language,
         _startPage = startPage,
@@ -153,6 +159,8 @@ class SettingsProvider extends ChangeNotifier {
         _customAccentColor = customAccentColor,
         _customBackgroundColor = customBackgroundColor,
         _customHighlightColor = customHighlightColor,
+        _customIconColor = customIconColor,
+        _shadowEffect = shadowEffect,
         _premiumScopes = premiumScopes,
         _premiumAccessToken = premiumAccessToken,
         _premiumLogin = premiumLogin,
@@ -161,7 +169,8 @@ class SettingsProvider extends ChangeNotifier {
         _renamedSubjectsItalics = renameSubjectsItalics,
         _renamedTeachersEnabled = renameTeachersEnabled,
         _renamedTeachersItalics = renameTeachersItalics,
-        _liveActivityColor = liveActivityColor;
+        _liveActivityColor = liveActivityColor,
+        _welcomeMessage = welcomeMessage;
 
   factory SettingsProvider.fromMap(Map map,
       {required DatabaseProvider database}) {
@@ -214,6 +223,8 @@ class SettingsProvider extends ChangeNotifier {
       customAccentColor: Color(map["custom_accent_color"]),
       customBackgroundColor: Color(map["custom_background_color"]),
       customHighlightColor: Color(map["custom_highlight_color"]),
+      customIconColor: Color(map["custom_icon_color"]),
+      shadowEffect: map["shadow_effect"] == 1,
       premiumScopes: jsonDecode(map["premium_scopes"]).cast<String>(),
       premiumAccessToken: map["premium_token"],
       premiumLogin: map["premium_login"],
@@ -223,6 +234,7 @@ class SettingsProvider extends ChangeNotifier {
       renameTeachersEnabled: map["renamed_teachers_enabled"] == 1,
       renameTeachersItalics: map["renamed_teachers_italics"] == 1,
       liveActivityColor: Color(map["live_activity_color"]),
+      welcomeMessage: map["welcome_message"],
     );
   }
 
@@ -263,6 +275,8 @@ class SettingsProvider extends ChangeNotifier {
       "custom_accent_color": _customAccentColor.value,
       "custom_background_color": _customBackgroundColor.value,
       "custom_highlight_color": _customHighlightColor.value,
+      "custom_icon_color": _customIconColor.value,
+      "shadow_effect": _shadowEffect ? 1 : 0,
       "premium_scopes": jsonEncode(_premiumScopes),
       "premium_token": _premiumAccessToken,
       "premium_login": _premiumLogin,
@@ -272,6 +286,7 @@ class SettingsProvider extends ChangeNotifier {
       "renamed_teachers_enabled": _renamedTeachersEnabled ? 1 : 0,
       "renamed_teachers_italics": _renamedTeachersItalics ? 1 : 0,
       "live_activity_color": _liveActivityColor.value,
+      "welcome_message": _welcomeMessage,
     };
   }
 
@@ -313,9 +328,11 @@ class SettingsProvider extends ChangeNotifier {
       bellDelay: 0,
       gradeOpeningFun: true,
       iconPack: IconPack.cupertino,
-      customAccentColor: const Color(0xff20AC9B),
+      customAccentColor: const Color(0xff3D7BF4),
       customBackgroundColor: const Color(0xff000000),
       customHighlightColor: const Color(0xff222222),
+      customIconColor: const Color(0x00000000),
+      shadowEffect: true,
       premiumScopes: [PremiumScopes.all],
       premiumAccessToken: "igen",
       premiumLogin: "igen",
@@ -325,6 +342,7 @@ class SettingsProvider extends ChangeNotifier {
       renameTeachersEnabled: false,
       renameTeachersItalics: false,
       liveActivityColor: const Color(0xFF676767),
+      welcomeMessage: '',
     );
   }
 
@@ -364,6 +382,8 @@ class SettingsProvider extends ChangeNotifier {
           : _customAccentColor;
   Color? get customBackgroundColor => _customBackgroundColor;
   Color? get customHighlightColor => _customHighlightColor;
+  Color? get customIconColor => _customIconColor;
+  bool get shadowEffect => _shadowEffect;
   List<String> get premiumScopes => _premiumScopes;
   String get premiumAccessToken => _premiumAccessToken;
   String get premiumLogin => _premiumLogin;
@@ -373,6 +393,7 @@ class SettingsProvider extends ChangeNotifier {
   bool get renamedTeachersEnabled => _renamedTeachersEnabled;
   bool get renamedTeachersItalics => _renamedTeachersItalics;
   Color get liveActivityColor => _liveActivityColor;
+  String get welcomeMessage => _welcomeMessage;
 
   Future<void> update({
     bool store = true,
@@ -408,6 +429,8 @@ class SettingsProvider extends ChangeNotifier {
     Color? customAccentColor,
     Color? customBackgroundColor,
     Color? customHighlightColor,
+    Color? customIconColor,
+    bool? shadowEffect,
     List<String>? premiumScopes,
     String? premiumAccessToken,
     String? premiumLogin,
@@ -417,6 +440,7 @@ class SettingsProvider extends ChangeNotifier {
     bool? renamedTeachersEnabled,
     bool? renamedTeachersItalics,
     Color? liveActivityColor,
+    String? welcomeMessage,
   }) async {
     if (language != null && language != _language) _language = language;
     if (startPage != null && startPage != _startPage) _startPage = startPage;
@@ -503,6 +527,12 @@ class SettingsProvider extends ChangeNotifier {
         customHighlightColor != _customHighlightColor) {
       _customHighlightColor = customHighlightColor;
     }
+    if (customIconColor != null && customIconColor != _customIconColor) {
+      _customIconColor = customIconColor;
+    }
+    if (shadowEffect != null && shadowEffect != _shadowEffect) {
+      _shadowEffect = shadowEffect;
+    }
     if (premiumScopes != null && premiumScopes != _premiumScopes) {
       _premiumScopes = premiumScopes;
     }
@@ -535,6 +565,9 @@ class SettingsProvider extends ChangeNotifier {
     if (liveActivityColor != null && liveActivityColor != _liveActivityColor) {
       _liveActivityColor = liveActivityColor;
     }
+    if (welcomeMessage != null && welcomeMessage != _welcomeMessage) {
+      _welcomeMessage = welcomeMessage;
+    }
     if (store) await _database?.store.storeSettings(this);
     notifyListeners();
   }

filcnaplo/lib/models/shared_theme.dart

@@ -0,0 +1,80 @@
+import 'dart:ui';
+
+class SharedTheme {
+  Map json;
+  String id;
+  bool isPublic;
+  String nickname;
+  Color backgroundColor;
+  Color panelsColor;
+  Color accentColor;
+  Color iconColor;
+  bool shadowEffect;
+  SharedGradeColors gradeColors;
+
+  SharedTheme({
+    required this.json,
+    required this.id,
+    this.isPublic = false,
+    this.nickname = 'Anonymous',
+    required this.backgroundColor,
+    required this.panelsColor,
+    required this.accentColor,
+    required this.iconColor,
+    required this.shadowEffect,
+    required this.gradeColors,
+  });
+
+  factory SharedTheme.fromJson(Map json, SharedGradeColors gradeColors) {
+    return SharedTheme(
+      json: json,
+      id: json['public_id'],
+      isPublic: json['is_public'] ?? false,
+      nickname: json['nickname'] ?? 'Anonymous',
+      backgroundColor: Color(json['background_color']),
+      panelsColor: Color(json['panels_color']),
+      accentColor: Color(json['accent_color']),
+      iconColor: Color(json['icon_color']),
+      shadowEffect: json['shadow_effect'] ?? true,
+      gradeColors: gradeColors,
+    );
+  }
+}
+
+class SharedGradeColors {
+  Map json;
+  String id;
+  bool isPublic;
+  String nickname;
+  Color fiveColor;
+  Color fourColor;
+  Color threeColor;
+  Color twoColor;
+  Color oneColor;
+
+  SharedGradeColors({
+    required this.json,
+    required this.id,
+    this.isPublic = false,
+    this.nickname = 'Anonymous',
+    required this.fiveColor,
+    required this.fourColor,
+    required this.threeColor,
+    required this.twoColor,
+    required this.oneColor,
+  });
+
+  factory SharedGradeColors.fromJson(Map json) {
+    return SharedGradeColors(
+      json: json,
+      id: json['public_id'],
+      isPublic: json['is_public'] ?? false,
+      nickname: json['nickname'] ?? 'Anonymous',
+      fiveColor: Color(json['five_color']),
+      fourColor: Color(json['four_color']),
+      threeColor: Color(json['three_color']),
+      twoColor: Color(json['two_color']),
+      oneColor: Color(json['one_color']),
+    );
+  }
+}

filcnaplo/lib/models/subject_lesson_count.dart

@@ -5,17 +5,21 @@ enum SubjectLessonCountUpdateState { ready, updating }
 
 class SubjectLessonCount {
   DateTime lastUpdated;
-  Map<Subject, int> subjects;
+  Map<GradeSubject, int> subjects;
   SubjectLessonCountUpdateState state;
 
-  SubjectLessonCount({required this.lastUpdated, required this.subjects, this.state = SubjectLessonCountUpdateState.ready});
+  SubjectLessonCount(
+      {required this.lastUpdated,
+      required this.subjects,
+      this.state = SubjectLessonCountUpdateState.ready});
 
   factory SubjectLessonCount.fromMap(Map json) {
     return SubjectLessonCount(
-      lastUpdated: DateTime.fromMillisecondsSinceEpoch(json["last_updated"] ?? 0),
+      lastUpdated:
+          DateTime.fromMillisecondsSinceEpoch(json["last_updated"] ?? 0),
       subjects: ((json["subjects"] as Map?) ?? {}).map(
         (key, value) => MapEntry(
-          Subject(id: key, name: "", category: Category.fromJson({})),
+          GradeSubject(id: key, name: "", category: Category.fromJson({})),
           value,
         ),
       ),

filcnaplo/lib/models/user.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 import 'package:filcnaplo_kreta_api/client/api.dart';
+import 'package:filcnaplo_kreta_api/models/school.dart';
 import 'package:filcnaplo_kreta_api/models/student.dart';
 import 'package:uuid/uuid.dart';
 
@@ -43,7 +44,16 @@ class User {
       username: map["username"],
       password: map["password"],
       name: map["name"].trim(),
-      student: Student.fromJson(jsonDecode(map["student"])),
+      student: map["student"] != 'null'
+          ? Student.fromJson(jsonDecode(map["student"]))
+          : Student(
+              id: const Uuid().v4(),
+              name: 'Ismeretlen Diák',
+              school: School(instituteCode: '', name: '', city: ''),
+              birth: DateTime.now(),
+              yearId: '1',
+              parents: [],
+            ),
       role: Role.values[map["role"] ?? 0],
       nickname: map["nickname"] ?? "",
       picture: map["picture"] ?? "",
@@ -93,4 +103,13 @@ class User {
       "refresh_user_data": "false",
     };
   }
+
+  static Map<String, Object?> logoutBody({
+    required String refreshToken,
+  }) {
+    return {
+      "refresh_token": refreshToken,
+      "client_id": KretaAPI.clientId,
+    };
+  }
 }

filcnaplo/lib/ui/filter/widgets.dart

@@ -1,3 +1,4 @@
+import 'package:filcnaplo/api/providers/ad_provider.dart';
 import 'package:filcnaplo/api/providers/update_provider.dart';
 import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/ui/date_widget.dart';
@@ -14,6 +15,7 @@ import 'package:filcnaplo/ui/filter/widgets/lessons.dart' as lesson_filter;
 import 'package:filcnaplo/ui/filter/widgets/update.dart' as update_filter;
 import 'package:filcnaplo/ui/filter/widgets/missed_exams.dart'
     as missed_exam_filter;
+import 'package:filcnaplo/ui/filter/widgets/ads.dart' as ad_filter;
 import 'package:filcnaplo_kreta_api/models/week.dart';
 import 'package:filcnaplo_kreta_api/providers/absence_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/event_provider.dart';
@@ -50,7 +52,8 @@ enum FilterType {
   lessons,
   updates,
   certifications,
-  missedExams
+  missedExams,
+  ads,
 }
 
 Future<List<DateWidget>> getFilterWidgets(FilterType activeData,
@@ -65,6 +68,7 @@ Future<List<DateWidget>> getFilterWidgets(FilterType activeData,
   final eventProvider = Provider.of<EventProvider>(context);
   final updateProvider = Provider.of<UpdateProvider>(context);
   final settingsProvider = Provider.of<SettingsProvider>(context);
+  final adProvider = Provider.of<AdProvider>(context);
 
   List<DateWidget> items = [];
 
@@ -82,6 +86,7 @@ Future<List<DateWidget>> getFilterWidgets(FilterType activeData,
         getFilterWidgets(FilterType.updates, context: context),
         getFilterWidgets(FilterType.certifications, context: context),
         getFilterWidgets(FilterType.missedExams, context: context),
+        getFilterWidgets(FilterType.ads, context: context),
       ]);
       items = all.expand((x) => x).toList();
 
@@ -89,13 +94,14 @@ Future<List<DateWidget>> getFilterWidgets(FilterType activeData,
 
     // Grades
     case FilterType.grades:
-    if(!settingsProvider.gradeOpeningFun) {
+      if (!settingsProvider.gradeOpeningFun) {
-      gradeProvider.seenAll();
+        gradeProvider.seenAll();
-    }
+      }
       items = grade_filter.getWidgets(
           gradeProvider.grades, gradeProvider.lastSeenDate);
       if (settingsProvider.gradeOpeningFun) {
         items.addAll(
+            // ignore: use_build_context_synchronously
             await getFilterWidgets(FilterType.newGrades, context: context));
       }
       break;
@@ -164,6 +170,13 @@ Future<List<DateWidget>> getFilterWidgets(FilterType activeData,
       items = missed_exam_filter
           .getWidgets(timetableProvider.getWeek(Week.current()) ?? []);
       break;
+
+    // Ads
+    case FilterType.ads:
+      if (adProvider.available) {
+        items = ad_filter.getWidgets(adProvider.ads);
+      }
+      break;
   }
   return items;
 }
@@ -201,19 +214,21 @@ Widget filterItemBuilder(
               child: DecoratedBox(
                 decoration: BoxDecoration(
                   boxShadow: [
-                    BoxShadow(
+                    if (Provider.of<SettingsProvider>(context, listen: false)
-                      offset: const Offset(0, 21),
+                        .shadowEffect)
-                      blurRadius: 23.0,
+                      BoxShadow(
-                      color: Theme.of(context).shadowColor.withOpacity(
+                        offset: const Offset(0, 21),
-                            Theme.of(context).shadowColor.opacity *
+                        blurRadius: 23.0,
-                                CurvedAnimation(
+                        color: Theme.of(context).shadowColor.withOpacity(
-                                  parent: CurvedAnimation(
+                              Theme.of(context).shadowColor.opacity *
-                                      parent: animation,
+                                  CurvedAnimation(
-                                      curve: Curves.easeInOutCubic),
+                                    parent: CurvedAnimation(
-                                  curve: const Interval(2 / 3, 1.0),
+                                        parent: animation,
-                                ).value,
+                                        curve: Curves.easeInOutCubic),
-                          ),
+                                    curve: const Interval(2 / 3, 1.0),
-                    ),
+                                  ).value,
+                            ),
+                      ),
                   ],
                 ),
                 child: child,

filcnaplo/lib/ui/filter/widgets/ads.dart

@@ -0,0 +1,25 @@
+import 'package:filcnaplo/models/ad.dart';
+import 'package:filcnaplo/ui/date_widget.dart';
+import 'package:filcnaplo_mobile_ui/common/widgets/ad/ad_viewable.dart'
+    as mobile;
+
+List<DateWidget> getWidgets(List<Ad> providerAds) {
+  List<DateWidget> items = [];
+
+  if (providerAds.isNotEmpty) {
+    for (var ad in providerAds) {
+      if (ad.date.isBefore(DateTime.now()) &&
+          ad.expireDate.isAfter(DateTime.now())) {
+        providerAds.sort((a, b) => -a.date.compareTo(b.date));
+
+        items.add(DateWidget(
+          key: ad.description,
+          date: ad.date,
+          widget: mobile.AdViewable(ad),
+        ));
+      }
+    }
+  }
+
+  return items;
+}

filcnaplo/lib/ui/widgets/grade/grade_tile.dart

@@ -34,8 +34,7 @@ class GradeTile extends StatelessWidget {
 
     GradeCalculatorProvider calculatorProvider =
         Provider.of<GradeCalculatorProvider>(context, listen: false);
-    SettingsProvider settingsProvider =
+    SettingsProvider settingsProvider = Provider.of<SettingsProvider>(context);
-        Provider.of<SettingsProvider>(context);
     // Test order:
     // description
     // mode
@@ -50,7 +49,8 @@ class GradeTile extends StatelessWidget {
       }
     } else {
       title = subjectName;
-      isTitleItalic = grade.subject.isRenamed && settingsProvider.renamedSubjectsItalics;
+      isTitleItalic =
+          grade.subject.isRenamed && settingsProvider.renamedSubjectsItalics;
     }
 
     // Test order:
@@ -62,7 +62,9 @@ class GradeTile extends StatelessWidget {
               ? modeDescription
               : ""
           : subjectName;
-      isSubtitleItalic = isSubjectView ? false : grade.subject.isRenamed && settingsProvider.renamedSubjectsItalics;
+      isSubtitleItalic = isSubjectView
+          ? false
+          : grade.subject.isRenamed && settingsProvider.renamedSubjectsItalics;
     } else {
       subtitle = grade.value.valueName.split("(")[0];
     }
@@ -127,9 +129,7 @@ class GradeTile extends StatelessWidget {
                   overflow: TextOverflow.ellipsis,
                   style: TextStyle(
                       fontWeight: FontWeight.w600,
-                      fontStyle: isTitleItalic
+                      fontStyle: isTitleItalic ? FontStyle.italic : null),
-                          ? FontStyle.italic
-                          : null),
                 ),
           subtitle: subtitle != ""
               ? censored
@@ -149,7 +149,10 @@ class GradeTile extends StatelessWidget {
                       subtitle,
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
-                      style: TextStyle(fontWeight: FontWeight.w500, fontStyle: isSubtitleItalic ? FontStyle.italic : null),
+                      style: TextStyle(
+                          fontWeight: FontWeight.w500,
+                          fontStyle:
+                              isSubtitleItalic ? FontStyle.italic : null),
                     )
               : null,
           trailing: isSubjectView
@@ -210,8 +213,8 @@ class GradeValueWidget extends StatelessWidget {
     GradeValue value = this.value;
     bool isSubjectView = SubjectGradesContainer.of(context) != null;
 
-    Color color =
+    Color color = this.color ??
-        this.color ?? gradeColor(context: context, value: value.value, nocolor: nocolor);
+        gradeColor(context: context, value: value.value, nocolor: nocolor);
     Widget valueText;
     final percentage = value.percentage;
 
@@ -283,7 +286,9 @@ class GradeValueWidget extends StatelessWidget {
               color: color.withOpacity(contrast ? 1.0 : .25),
               shape: BoxShape.circle,
               boxShadow: [
-                if (shadow)
+                if (shadow &&
+                    Provider.of<SettingsProvider>(context, listen: false)
+                        .shadowEffect)
                   BoxShadow(
                     color: color,
                     blurRadius: 62.0,

filcnaplo/linux/.gitignore

@@ -1 +0,0 @@
-flutter/ephemeral

filcnaplo/linux/CMakeLists.txt

@@ -1,116 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(runner LANGUAGES CXX)
-
-set(BINARY_NAME "filcnaplo")
-set(APPLICATION_ID "hu.filc.filcnaplo")
-
-cmake_policy(SET CMP0063 NEW)
-
-set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
-
-# Root filesystem for cross-building.
-if(FLUTTER_TARGET_PLATFORM_SYSROOT)
-  set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
-  set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
-  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-  set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endif()
-
-# Configure build options.
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  set(CMAKE_BUILD_TYPE "Debug" CACHE
-    STRING "Flutter build mode" FORCE)
-  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    "Debug" "Profile" "Release")
-endif()
-
-# Compilation settings that should be applied to most targets.
-function(APPLY_STANDARD_SETTINGS TARGET)
-  target_compile_features(${TARGET} PUBLIC cxx_std_14)
-  target_compile_options(${TARGET} PRIVATE -Wall -Werror)
-  target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
-  target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
-endfunction()
-
-set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
-
-# Flutter library and tool build rules.
-add_subdirectory(${FLUTTER_MANAGED_DIR})
-
-# System-level dependencies.
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
-
-add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
-
-# Application build
-add_executable(${BINARY_NAME}
-  "main.cc"
-  "my_application.cc"
-  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
-)
-apply_standard_settings(${BINARY_NAME})
-target_link_libraries(${BINARY_NAME} PRIVATE flutter)
-target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
-add_dependencies(${BINARY_NAME} flutter_assemble)
-# Only the install-generated bundle's copy of the executable will launch
-# correctly, since the resources must in the right relative locations. To avoid
-# people trying to run the unbundled copy, put it in a subdirectory instead of
-# the default top-level location.
-set_target_properties(${BINARY_NAME}
-  PROPERTIES
-  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
-)
-
-# Generated plugin build rules, which manage building the plugins and adding
-# them to the application.
-include(flutter/generated_plugins.cmake)
-
-
-# === Installation ===
-# By default, "installing" just makes a relocatable bundle in the build
-# directory.
-set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle")
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
-endif()
-
-# Start with a clean build bundle directory every time.
-install(CODE "
-  file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\")
-  " COMPONENT Runtime)
-
-set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
-set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-
-install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
-  COMPONENT Runtime)
-
-install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
-  COMPONENT Runtime)
-
-install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-  COMPONENT Runtime)
-
-if(PLUGIN_BUNDLED_LIBRARIES)
-  install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
-    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-    COMPONENT Runtime)
-endif()
-
-# Fully re-copy the assets directory on each build to avoid having stale files
-# from a previous install.
-set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
-install(CODE "
-  file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
-  " COMPONENT Runtime)
-install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
-  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
-
-# Install the AOT library on non-Debug builds only.
-if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
-  install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
-    COMPONENT Runtime)
-endif()

filcnaplo/linux/flutter/CMakeLists.txt

@@ -1,87 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-
-set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
-
-# Configuration provided via flutter tool.
-include(${EPHEMERAL_DIR}/generated_config.cmake)
-
-# TODO: Move the rest of this into files in ephemeral. See
-# https://github.com/flutter/flutter/issues/57146.
-
-# Serves the same purpose as list(TRANSFORM ... PREPEND ...),
-# which isn't available in 3.10.
-function(list_prepend LIST_NAME PREFIX)
-    set(NEW_LIST "")
-    foreach(element ${${LIST_NAME}})
-        list(APPEND NEW_LIST "${PREFIX}${element}")
-    endforeach(element)
-    set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE)
-endfunction()
-
-# === Flutter Library ===
-# System-level dependencies.
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
-pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
-pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
-
-set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
-
-# Published to parent scope for install step.
-set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
-set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
-set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
-set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE)
-
-list(APPEND FLUTTER_LIBRARY_HEADERS
-  "fl_basic_message_channel.h"
-  "fl_binary_codec.h"
-  "fl_binary_messenger.h"
-  "fl_dart_project.h"
-  "fl_engine.h"
-  "fl_json_message_codec.h"
-  "fl_json_method_codec.h"
-  "fl_message_codec.h"
-  "fl_method_call.h"
-  "fl_method_channel.h"
-  "fl_method_codec.h"
-  "fl_method_response.h"
-  "fl_plugin_registrar.h"
-  "fl_plugin_registry.h"
-  "fl_standard_message_codec.h"
-  "fl_standard_method_codec.h"
-  "fl_string_codec.h"
-  "fl_value.h"
-  "fl_view.h"
-  "flutter_linux.h"
-)
-list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/")
-add_library(flutter INTERFACE)
-target_include_directories(flutter INTERFACE
-  "${EPHEMERAL_DIR}"
-)
-target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}")
-target_link_libraries(flutter INTERFACE
-  PkgConfig::GTK
-  PkgConfig::GLIB
-  PkgConfig::GIO
-)
-add_dependencies(flutter flutter_assemble)
-
-# === Flutter tool backend ===
-# _phony_ is a non-existent file to force this command to run every time,
-# since currently there's no way to get a full input/output list from the
-# flutter tool.
-add_custom_command(
-  OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
-    ${CMAKE_CURRENT_BINARY_DIR}/_phony_
-  COMMAND ${CMAKE_COMMAND} -E env
-    ${FLUTTER_TOOL_ENVIRONMENT}
-    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh"
-      ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE}
-  VERBATIM
-)
-add_custom_target(flutter_assemble DEPENDS
-  "${FLUTTER_LIBRARY}"
-  ${FLUTTER_LIBRARY_HEADERS}
-)

filcnaplo/linux/my_application.cc

@@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) {
   if (use_header_bar) {
     GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
     gtk_widget_show(GTK_WIDGET(header_bar));
-    gtk_header_bar_set_title(header_bar, "Filc Napló");
+    gtk_header_bar_set_title(header_bar, "reFilc");
     gtk_header_bar_set_show_close_button(header_bar, TRUE);
     gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
   } else {
-    gtk_window_set_title(window, "Filc Napló");
+    gtk_window_set_title(window, "reFilc");
   }
 
   gtk_window_set_default_size(window, 1280, 720);

filcnaplo/macos/.gitignore

@@ -1,7 +0,0 @@
-# Flutter-related
-**/Flutter/ephemeral/
-**/Pods/
-
-# Xcode-related
-**/dgph
-**/xcuserdata/

filcnaplo/macos/Flutter/Flutter-Debug.xcconfig

@@ -1,2 +0,0 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
-#include "ephemeral/Flutter-Generated.xcconfig"

filcnaplo/macos/Flutter/Flutter-Release.xcconfig

@@ -1,2 +0,0 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
-#include "ephemeral/Flutter-Generated.xcconfig"

filcnaplo/pubspec.yaml

@@ -3,7 +3,7 @@ description: "Nem hivatalos e-napló alkalmazás az e-Kréta rendszerhez"
 homepage: https://refilc.hu
 publish_to: "none"
 
-version: 4.2.1+221
+version: 4.4.0+233
 
 environment:
   sdk: ">=2.17.0 <3.0.0"
@@ -44,7 +44,7 @@ dependencies:
   quick_actions: ^1.0.1
   animated_list_plus: ^0.5.0
   dynamic_color: ^1.2.2
-  material_color_utilities: ^0.2.0
+  material_color_utilities: ^0.5.0
   crypto: ^3.0.2
   elegant_notification: ^1.6.1
   flutter_feather_icons: ^2.0.0+1

filcnaplo/windows/.gitignore

@@ -1,17 +0,0 @@
-flutter/ephemeral/
-
-# Visual Studio user-specific files.
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# Visual Studio build-related files.
-x64/
-x86/
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/

filcnaplo_desktop_ui/.gitignore

@@ -1,47 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# Web related
-lib/generated_plugin_registrant.dart
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
-pubspec.lock

filcnaplo_desktop_ui/lib/pages/absences/absences_page.dart

@@ -31,7 +31,7 @@ import 'absences_page.i18n.dart';
 enum AbsenceFilter { absences, delays, misses }
 
 class SubjectAbsence {
-  Subject subject;
+  GradeSubject subject;
   List<Absence> absences;
   double percentage;
 
@@ -56,7 +56,7 @@ class _AbsencesPageState extends State<AbsencesPage>
   late String firstName;
   late TabController _tabController;
   late List<SubjectAbsence> absences = [];
-  final Map<Subject, Lesson> _lessonCount = {};
+  final Map<GradeSubject, Lesson> _lessonCount = {};
 
   @override
   void initState() {
@@ -87,7 +87,7 @@ class _AbsencesPageState extends State<AbsencesPage>
   }
 
   void buildSubjectAbsences() {
-    Map<Subject, SubjectAbsence> _absences = {};
+    Map<GradeSubject, SubjectAbsence> _absences = {};
 
     for (final absence in absenceProvider.absences) {
       if (absence.delay != 0) continue;

filcnaplo_desktop_ui/lib/pages/grades/grade_subject_view.dart

@@ -32,7 +32,7 @@ class GradeSubjectView extends StatefulWidget {
   const GradeSubjectView(this.subject, {Key? key, this.groupAverage = 0.0})
       : super(key: key);
 
-  final Subject subject;
+  final GradeSubject subject;
   final double groupAverage;
 
   void push(BuildContext context, {bool root = false}) {
@@ -62,7 +62,7 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
 
   bool gradeCalcMode = false;
 
-  List<Grade> getSubjectGrades(Subject subject) => !gradeCalcMode
+  List<Grade> getSubjectGrades(GradeSubject subject) => !gradeCalcMode
       ? gradeProvider.grades.where((e) => e.subject == subject).toList()
       : calculatorProvider.grades.where((e) => e.subject == subject).toList();
 

filcnaplo_desktop_ui/lib/pages/grades/grades_page.dart

@@ -41,7 +41,7 @@ class _GradesPageState extends State<GradesPage> {
 
   int avgDropValue = 0;
 
-  List<Grade> getSubjectGrades(Subject subject, {int days = 0}) => gradeProvider
+  List<Grade> getSubjectGrades(GradeSubject subject, {int days = 0}) => gradeProvider
       .grades
       .where((e) =>
           e.subject == subject &&
@@ -51,14 +51,14 @@ class _GradesPageState extends State<GradesPage> {
       .toList();
 
   void generateTiles() {
-    List<Subject> subjects = gradeProvider.grades
+    List<GradeSubject> subjects = gradeProvider.grades
         .map((e) => e.subject)
         .toSet()
         .toList()
       ..sort((a, b) => a.name.compareTo(b.name));
     List<Widget> tiles = [];
 
-    Map<Subject, double> subjectAvgs = {};
+    Map<GradeSubject, double> subjectAvgs = {};
 
     tiles.addAll(subjects.map((subject) {
       List<Grade> subjectGrades = getSubjectGrades(subject);
@@ -144,8 +144,8 @@ class _GradesPageState extends State<GradesPage> {
           Expanded(
             child: StatisticsTile(
               outline: true,
-              title: AutoSizeText(
+              title: AutoSizeText( // https://discord.com/channels/1111649116020285532/1153397476578050130
-                "classavg".i18n,
+                "classavg".i18n, 
                 textAlign: TextAlign.center,
                 maxLines: 2,
                 wrapWords: false,

filcnaplo_desktop_ui/lib/pages/grades/grades_page.i18n.dart

@@ -16,7 +16,7 @@ extension Localization on String {
           "7_days_average": "Weekly Average",
           "subjectavg": "Subject Average",
           "classavg": "Class Average",
-          "fail_warning": "Faliure warning",
+          "fail_warning": "Failure warning",
           "fail_warning_description": "You are failing %d subject(s)",
         },
         "hu_hu": {

filcnaplo_desktop_ui/lib/screens/login/login_screen.dart

@@ -5,15 +5,25 @@ import 'package:elegant_notification/elegant_notification.dart';
 import 'package:elegant_notification/resources/arrays.dart';
 import 'package:filcnaplo/api/client.dart';
 import 'package:filcnaplo/api/login.dart';
-import 'package:filcnaplo/theme/colors/colors.dart';
 import 'package:filcnaplo_mobile_ui/screens/login/login_button.dart';
 import 'package:filcnaplo_mobile_ui/screens/login/login_input.dart';
-import 'package:filcnaplo_mobile_ui/screens/login/school_input/school_input.dart';
+// import 'package:filcnaplo_desktop_ui/screens/login/school_input/school_input.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_acrylic/flutter_acrylic.dart';
 import 'login_screen.i18n.dart';
 
+const LinearGradient _backgroundGradient = LinearGradient(
+  colors: [
+    Color.fromARGB(255, 61, 122, 244),
+    Color.fromARGB(255, 23, 77, 185),
+    Color.fromARGB(255, 7, 42, 112),
+  ],
+  begin: Alignment(-0.8, -2.0),
+  end: Alignment(0.8, 1.0),
+  stops: [-1.0, 0.0, 1.0],
+);
+
 class LoginScreen extends StatefulWidget {
   const LoginScreen({Key? key, this.back = false}) : super(key: key);
 
@@ -26,8 +36,8 @@ class LoginScreen extends StatefulWidget {
 class _LoginScreenState extends State<LoginScreen> {
   final usernameController = TextEditingController();
   final passwordController = TextEditingController();
-  final schoolController = SchoolInputController();
+  // final schoolController = SchoolInputController();
-  final _scrollController = ScrollController();
+  // final _scrollController = ScrollController();
 
   LoginState _loginState = LoginState.normal;
   bool showBack = false;
@@ -47,9 +57,9 @@ class _LoginScreenState extends State<LoginScreen> {
 
     FilcAPI.getSchools().then((schools) {
       if (schools != null) {
-        schoolController.update(() {
+        // schoolController.update(() {
-          schoolController.schools = schools;
+        //   schoolController.schools = schools;
-        });
+        // });
       } else {
         ElegantNotification.error(
           background: Colors.white,
@@ -70,210 +80,236 @@ class _LoginScreenState extends State<LoginScreen> {
       }
     });
 
-    if (Platform.isMacOS) Window.getTitlebarHeight().then((value) => setState(() => topInset = value));
+    if (Platform.isMacOS) {
+      Window.getTitlebarHeight()
+          .then((value) => setState(() => topInset = value));
+    }
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: AppColors.of(context).filc,
+      body: Container(
-      body: SafeArea(
+        decoration: const BoxDecoration(
-        child: Stack(
+          gradient: _backgroundGradient,
-          children: [
+        ),
-            Row(
+        child: SafeArea(
-              children: [
+          child: Stack(
-                Expanded(
+            children: [
-                  child: Column(
+              Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
+                children: [
-                    children: [
+                  Expanded(
-                      // App logo
+                    child: Column(
-                      Padding(
+                      mainAxisAlignment: MainAxisAlignment.center,
-                        padding: const EdgeInsets.only(bottom: 24.0),
+                      children: [
-                        child: ClipRect(
+                        // App logo
-                          child: Padding(
-                            padding: const EdgeInsets.only(left: 12.0, right: 12.0, bottom: 32.0),
-                            child: SizedBox(
-                              width: 82.0,
-                              height: 82.0,
-                              // Png shadow *hack*
-                              child: Stack(
-                                children: [
-                                  Padding(
-                                    padding: const EdgeInsets.only(top: 8.0),
-                                    child: Opacity(child: Image.asset("assets/icons/ic_splash.png", color: Colors.black), opacity: 0.3),
-                                  ),
-                                  BackdropFilter(
-                                    filter: ImageFilter.blur(sigmaX: 6.0, sigmaY: 6.0),
-                                    child: Image.asset("assets/icons/ic_splash.png"),
-                                  )
-                                ],
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-
-                      // Inputs
-                      SizedBox(
-                        width: 400.0,
-                        child: AutofillGroup(
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              // Username
-                              Padding(
-                                padding: const EdgeInsets.only(bottom: 6.0),
-                                child: Row(
-                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                  children: [
-                                    Expanded(
-                                      child: Text(
-                                        "username".i18n,
-                                        maxLines: 1,
-                                        style: const TextStyle(
-                                          color: Colors.white,
-                                          fontWeight: FontWeight.w600,
-                                          fontSize: 14.0,
-                                        ),
-                                      ),
-                                    ),
-                                    Expanded(
-                                      child: Text(
-                                        "usernameHint".i18n,
-                                        maxLines: 1,
-                                        textAlign: TextAlign.right,
-                                        style: const TextStyle(
-                                          color: Colors.white54,
-                                          fontWeight: FontWeight.w500,
-                                          fontSize: 12.0,
-                                        ),
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              Padding(
-                                padding: const EdgeInsets.only(bottom: 12.0),
-                                child: LoginInput(
-                                  style: LoginInputStyle.username,
-                                  controller: usernameController,
-                                ),
-                              ),
-
-                              // Password
-                              Padding(
-                                padding: const EdgeInsets.only(bottom: 6.0),
-                                child: Row(
-                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                  children: [
-                                    Expanded(
-                                      child: Text(
-                                        "password".i18n,
-                                        maxLines: 1,
-                                        style: const TextStyle(
-                                          color: Colors.white,
-                                          fontWeight: FontWeight.w600,
-                                          fontSize: 14.0,
-                                        ),
-                                      ),
-                                    ),
-                                    Expanded(
-                                      child: Text(
-                                        "passwordHint".i18n,
-                                        maxLines: 1,
-                                        textAlign: TextAlign.right,
-                                        style: const TextStyle(
-                                          color: Colors.white54,
-                                          fontWeight: FontWeight.w500,
-                                          fontSize: 12.0,
-                                        ),
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              ),
-                              Padding(
-                                padding: const EdgeInsets.only(bottom: 12.0),
-                                child: LoginInput(
-                                  style: LoginInputStyle.password,
-                                  controller: passwordController,
-                                ),
-                              ),
-
-                              // School
-                              Padding(
-                                padding: const EdgeInsets.only(bottom: 6.0),
-                                child: Text(
-                                  "school".i18n,
-                                  maxLines: 1,
-                                  style: const TextStyle(
-                                    color: Colors.white,
-                                    fontWeight: FontWeight.w600,
-                                    fontSize: 14.0,
-                                  ),
-                                ),
-                              ),
-                              SchoolInput(
-                                scroll: _scrollController,
-                                controller: schoolController,
-                              ),
-                            ],
-                          ),
-                        ),
-                      ),
-
-                      // Log in button
-                      SizedBox(
-                        width: 400.0,
-                        child: Padding(
-                          padding: const EdgeInsets.only(top: 42.0),
-                          child: Visibility(
-                            child: LoginButton(
-                              child: Text("login".i18n,
-                                  maxLines: 1,
-                                  style: const TextStyle(
-                                    fontWeight: FontWeight.w600,
-                                    fontSize: 15.0,
-                                  )),
-                              onPressed: () => _loginAPI(context: context),
-                            ),
-                            visible: _loginState != LoginState.inProgress,
-                            replacement: const Padding(
-                              padding: EdgeInsets.symmetric(vertical: 6.0),
-                              child: Center(
-                                child: CircularProgressIndicator(
-                                  valueColor: AlwaysStoppedAnimation<Color>(Colors.white),
-                                ),
-                              ),
-                            ),
-                          ),
-                        ),
-                      ),
-                      if (_loginState == LoginState.missingFields || _loginState == LoginState.invalidGrant || _loginState == LoginState.failed)
                         Padding(
-                          padding: const EdgeInsets.only(top: 8.0),
+                          padding: const EdgeInsets.only(bottom: 24.0),
-                          child: Text(
+                          child: ClipRect(
-                            ["missing_fields", "invalid_grant", "error"][_loginState.index].i18n,
+                            child: Padding(
-                            style: const TextStyle(color: Colors.red, fontWeight: FontWeight.w500),
+                              padding: const EdgeInsets.only(
+                                  left: 12.0, right: 12.0, bottom: 32.0),
+                              child: SizedBox(
+                                width: 100.0,
+                                height: 100.0,
+                                // Png shadow *hack*
+                                child: Stack(
+                                  children: [
+                                    Padding(
+                                      padding: const EdgeInsets.only(top: 8.0),
+                                      child: Opacity(
+                                          child: Image.asset(
+                                              "assets/icons/ic_splash.png",
+                                              color: Colors.black),
+                                          opacity: 0.3),
+                                    ),
+                                    BackdropFilter(
+                                      filter: ImageFilter.blur(
+                                          sigmaX: 6.0, sigmaY: 6.0),
+                                      child: Image.asset(
+                                          "assets/icons/ic_splash.png"),
+                                    )
+                                  ],
+                                ),
+                              ),
+                            ),
                           ),
                         ),
-                    ],
+
+                        // Inputs
+                        SizedBox(
+                          width: 400.0,
+                          child: AutofillGroup(
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                // Username
+                                Padding(
+                                  padding: const EdgeInsets.only(bottom: 6.0),
+                                  child: Row(
+                                    mainAxisAlignment:
+                                        MainAxisAlignment.spaceBetween,
+                                    children: [
+                                      Expanded(
+                                        child: Text(
+                                          "username".i18n,
+                                          maxLines: 1,
+                                          style: const TextStyle(
+                                            color: Colors.white,
+                                            fontWeight: FontWeight.w600,
+                                            fontSize: 14.0,
+                                          ),
+                                        ),
+                                      ),
+                                      Expanded(
+                                        child: Text(
+                                          "usernameHint".i18n,
+                                          maxLines: 1,
+                                          textAlign: TextAlign.right,
+                                          style: const TextStyle(
+                                            color: Colors.white54,
+                                            fontWeight: FontWeight.w500,
+                                            fontSize: 12.0,
+                                          ),
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                                Padding(
+                                  padding: const EdgeInsets.only(bottom: 12.0),
+                                  child: LoginInput(
+                                    style: LoginInputStyle.username,
+                                    controller: usernameController,
+                                  ),
+                                ),
+
+                                // Password
+                                Padding(
+                                  padding: const EdgeInsets.only(bottom: 6.0),
+                                  child: Row(
+                                    mainAxisAlignment:
+                                        MainAxisAlignment.spaceBetween,
+                                    children: [
+                                      Expanded(
+                                        child: Text(
+                                          "password".i18n,
+                                          maxLines: 1,
+                                          style: const TextStyle(
+                                            color: Colors.white,
+                                            fontWeight: FontWeight.w600,
+                                            fontSize: 14.0,
+                                          ),
+                                        ),
+                                      ),
+                                      Expanded(
+                                        child: Text(
+                                          "passwordHint".i18n,
+                                          maxLines: 1,
+                                          textAlign: TextAlign.right,
+                                          style: const TextStyle(
+                                            color: Colors.white54,
+                                            fontWeight: FontWeight.w500,
+                                            fontSize: 12.0,
+                                          ),
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                                Padding(
+                                  padding: const EdgeInsets.only(bottom: 12.0),
+                                  child: LoginInput(
+                                    style: LoginInputStyle.password,
+                                    controller: passwordController,
+                                  ),
+                                ),
+
+                                // School
+                                Padding(
+                                  padding: const EdgeInsets.only(bottom: 6.0),
+                                  child: Text(
+                                    "school".i18n,
+                                    maxLines: 1,
+                                    style: const TextStyle(
+                                      color: Colors.white,
+                                      fontWeight: FontWeight.w600,
+                                      fontSize: 14.0,
+                                    ),
+                                  ),
+                                ),
+                                // SchoolInput(
+                                //   scroll: _scrollController,
+                                //   controller: schoolController,
+                                // ),
+                              ],
+                            ),
+                          ),
+                        ),
+
+                        // Log in button
+                        SizedBox(
+                          width: 400.0,
+                          child: Padding(
+                            padding: const EdgeInsets.only(top: 42.0),
+                            child: Visibility(
+                              child: LoginButton(
+                                child: Text("login".i18n,
+                                    maxLines: 1,
+                                    style: const TextStyle(
+                                      fontWeight: FontWeight.w600,
+                                      fontSize: 15.0,
+                                    )),
+                                onPressed: () => _loginAPI(context: context),
+                              ),
+                              visible: _loginState != LoginState.inProgress,
+                              replacement: const Padding(
+                                padding: EdgeInsets.symmetric(vertical: 6.0),
+                                child: Center(
+                                  child: CircularProgressIndicator(
+                                    valueColor: AlwaysStoppedAnimation<Color>(
+                                        Colors.white),
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ),
+                        ),
+                        if (_loginState == LoginState.missingFields ||
+                            _loginState == LoginState.invalidGrant ||
+                            _loginState == LoginState.failed)
+                          Padding(
+                            padding: const EdgeInsets.only(top: 8.0),
+                            child: Text(
+                              [
+                                "missing_fields",
+                                "invalid_grant",
+                                "error"
+                              ][_loginState.index]
+                                  .i18n,
+                              style: const TextStyle(
+                                  color: Colors.red,
+                                  fontWeight: FontWeight.w500),
+                            ),
+                          ),
+                      ],
+                    ),
                   ),
-                ),
+                ],
-              ],
-            ),
-            if (showBack)
-              Container(
-                alignment: Alignment.topLeft,
-                padding: EdgeInsets.only(left: 16.0, top: topInset),
-                child: const ClipOval(
-                  child: Material(
-                    type: MaterialType.transparency,
-                    child: BackButton(color: Colors.white),
-                  ),
-                ),
               ),
-          ],
+              if (showBack)
+                Container(
+                  alignment: Alignment.topLeft,
+                  padding: EdgeInsets.only(left: 16.0, top: topInset),
+                  child: const ClipOval(
+                    child: Material(
+                      type: MaterialType.transparency,
+                      child: BackButton(color: Colors.white),
+                    ),
+                  ),
+                ),
+            ],
+          ),
         ),
       ),
     );
@@ -283,7 +319,11 @@ class _LoginScreenState extends State<LoginScreen> {
     String username = usernameController.text;
     String password = passwordController.text;
 
-    if (username == "" || password == "" || schoolController.selectedSchool == null) {
+    if (username == "" ||
+            password ==
+                "" /*||
+        schoolController.selectedSchool == null*/
+        ) {
       return setState(() => _loginState = LoginState.missingFields);
     }
 
@@ -292,7 +332,8 @@ class _LoginScreenState extends State<LoginScreen> {
     loginAPI(
         username: username,
         password: password,
-        instituteCode: schoolController.selectedSchool!.instituteCode,
+        instituteCode: 'shit',
+        // instituteCode: schoolController.selectedSchool!.instituteCode,
         context: context,
         onLogin: (user) {
           ElegantNotification.success(
@@ -313,7 +354,8 @@ class _LoginScreenState extends State<LoginScreen> {
           ).show(context);
         },
         onSuccess: () {
-          Navigator.of(context).pushNamedAndRemoveUntil("login_to_navigation", (_) => false);
+          Navigator.of(context)
+              .pushNamedAndRemoveUntil("login_to_navigation", (_) => false);
         }).then((res) => setState(() => _loginState = res));
   }
 }

filcnaplo_desktop_ui/lib/screens/login/school_input/school_input.dart

@@ -0,0 +1,122 @@
+import 'package:filcnaplo_mobile_ui/screens/login/login_input.dart';
+import 'package:filcnaplo_mobile_ui/screens/login/school_input/school_input_overlay.dart';
+import 'package:filcnaplo_desktop_ui/screens/login/school_input/school_input_tile.dart';
+import 'package:filcnaplo_mobile_ui/screens/login/school_input/school_search.dart';
+import 'package:flutter/material.dart';
+import 'package:filcnaplo_kreta_api/models/school.dart';
+
+class SchoolInput extends StatefulWidget {
+  const SchoolInput({Key? key, required this.controller, required this.scroll})
+      : super(key: key);
+
+  final SchoolInputController controller;
+  final ScrollController scroll;
+
+  @override
+  _SchoolInputState createState() => _SchoolInputState();
+}
+
+class _SchoolInputState extends State<SchoolInput> {
+  final _focusNode = FocusNode();
+  final _layerLink = LayerLink();
+  late SchoolInputOverlay overlay;
+
+  @override
+  void initState() {
+    super.initState();
+
+    widget.controller.update = (fn) {
+      if (mounted) setState(fn);
+    };
+
+    overlay = SchoolInputOverlay(layerLink: _layerLink);
+
+    // Show school list when focused
+    _focusNode.addListener(() {
+      if (_focusNode.hasFocus) {
+        WidgetsBinding.instance
+            .addPostFrameCallback((_) => overlay.createOverlayEntry(context));
+        Future.delayed(const Duration(milliseconds: 100)).then((value) {
+          if (mounted && widget.scroll.hasClients) {
+            widget.scroll.animateTo(widget.scroll.offset + 500,
+                duration: const Duration(milliseconds: 500),
+                curve: Curves.ease);
+          }
+        });
+      } else {
+        overlay.entry?.remove();
+      }
+    });
+
+    // LoginInput TextField listener
+    widget.controller.textController.addListener(() {
+      String text = widget.controller.textController.text;
+      if (text.isEmpty) {
+        overlay.children = null;
+        return;
+      }
+
+      List<School> results =
+          searchSchools(widget.controller.schools ?? [], text);
+      setState(() {
+        overlay.children = results
+            .map((School e) => SchoolInputTile(
+                  school: e,
+                  onTap: () => _selectSchool(e),
+                ))
+            .toList();
+      });
+      Overlay.of(context).setState(() {});
+    });
+  }
+
+  void _selectSchool(School school) {
+    FocusScope.of(context).requestFocus(FocusNode());
+
+    setState(() {
+      widget.controller.selectedSchool = school;
+      widget.controller.textController.text = school.name;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return CompositedTransformTarget(
+      link: _layerLink,
+      child: widget.controller.schools == null
+          ? Container(
+              width: double.infinity,
+              padding: const EdgeInsets.symmetric(vertical: 10.0),
+              decoration: BoxDecoration(
+                color: Colors.black.withOpacity(0.15),
+                borderRadius: BorderRadius.circular(12.0),
+              ),
+              child: const Center(
+                child: SizedBox(
+                  height: 28.0,
+                  width: 28.0,
+                  child: CircularProgressIndicator(
+                    color: Colors.white,
+                  ),
+                ),
+              ),
+            )
+          : LoginInput(
+              style: LoginInputStyle.school,
+              focusNode: _focusNode,
+              onClear: () {
+                widget.controller.selectedSchool = null;
+                FocusScope.of(context).requestFocus(_focusNode);
+              },
+              controller: widget.controller.textController,
+            ),
+    );
+  }
+}
+
+class SchoolInputController {
+  final textController = TextEditingController();
+  School? selectedSchool;
+  List<School>? schools;
+  late void Function(void Function()) update;
+}

filcnaplo_desktop_ui/lib/screens/login/school_input/school_input_tile.dart

@@ -0,0 +1,65 @@
+import 'package:filcnaplo_kreta_api/models/school.dart';
+import 'package:flutter/material.dart';
+
+class SchoolInputTile extends StatelessWidget {
+  const SchoolInputTile({Key? key, required this.school, this.onTap})
+      : super(key: key);
+
+  final School school;
+  final Function()? onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(4.0),
+      child: GestureDetector(
+        onPanDown: (e) {
+          onTap!();
+        },
+        child: InkWell(
+          onTapDown: (e) {},
+          borderRadius: BorderRadius.circular(6.0),
+          child: Padding(
+            padding: const EdgeInsets.all(6.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                // School name
+                Padding(
+                  padding: const EdgeInsets.only(bottom: 4.0),
+                  child: Text(
+                    school.name,
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
+                    style: const TextStyle(fontWeight: FontWeight.w600),
+                  ),
+                ),
+                Row(
+                  children: [
+                    // School id
+                    Expanded(
+                      child: Text(
+                        school.instituteCode,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                    // School city
+                    Expanded(
+                      child: Text(
+                        school.city,
+                        textAlign: TextAlign.right,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

filcnaplo_desktop_ui/lib/screens/navigation/navigation_screen.dart

@@ -63,8 +63,12 @@ class NavigationScreenState extends State<NavigationScreen>
         await Window.initialize();
       } catch (_) {}
       // Transparent sidebar
+      if (Platform.isLinux) return;
+
       await Window.setEffect(
-          effect: WindowEffect.acrylic,
+          effect: Platform.isLinux
+              ? WindowEffect.transparent
+              : WindowEffect.acrylic,
           color: Platform.isMacOS
               ? Colors.transparent
               : const Color.fromARGB(27, 27, 27, 27));

filcnaplo_desktop_ui/lib/screens/navigation/sidebar.dart

@@ -176,13 +176,16 @@ class _SidebarState extends State<Sidebar> {
           String? userId = user.id;
           if (userId == null) return;
 
-          // Delete User
+          // revoke refresh token
+          await Provider.of<KretaClient>(context, listen: false).logout();
+
+          // delete user from app
           user.removeUser(userId);
           await Provider.of<DatabaseProvider>(context, listen: false)
               .store
               .removeUser(userId);
 
-          // If no other Users left, go back to LoginScreen
+          // if no other users left, go back to login screen
           if (user.getUsers().isNotEmpty) {
             user.setUser(user.getUsers().first.id);
             restore().then((_) => user.setUser(user.getUsers().first.id));

filcnaplo_desktop_ui/lib/screens/settings/settings_screen.i18n.dart

@@ -5,7 +5,7 @@ extension SettingsLocalization on String {
       {
         "en_en": {
           "personal_details": "Personal Details",
-          "open_dkt": "Open DKT",
+          "open_dkt": "Open DCS",
           "edit_nickname": "Edit Nickname",
           "edit_profile_picture": "Edit Profile Picture",
           "remove_profile_picture": "Remove Profile Picture",
@@ -39,7 +39,8 @@ extension SettingsLocalization on String {
           "done": "Done",
           "reset": "Reset",
           "open": "Open",
-          "data_collected": "Data collected: Platform (eg. Android), App version (eg. 3.0.0), Unique Install Identifier",
+          "data_collected":
+              "Data collected: Platform (eg. Android), App version (eg. 3.0.0), Unique Install Identifier",
           "Analytics": "Analytics",
           "Anonymous Usage Analytics": "Anonymous Usage Analytics",
           "graph_class_avg": "Class average on graph",
@@ -98,7 +99,8 @@ extension SettingsLocalization on String {
           "done": "Kész",
           "reset": "Visszaállítás",
           "open": "Megnyitás",
-          "data_collected": "Gyűjtött adat: Platform (pl. Android), App verzió (pl. 3.0.0), Egyedi telepítési azonosító",
+          "data_collected":
+              "Gyűjtött adat: Platform (pl. Android), App verzió (pl. 3.0.0), Egyedi telepítési azonosító",
           "Analytics": "Analitika",
           "Anonymous Usage Analytics": "Névtelen használati analitika",
           "graph_class_avg": "Osztályátlag a grafikonon",
@@ -123,7 +125,7 @@ extension SettingsLocalization on String {
         },
         "de_de": {
           "personal_details": "Persönliche Angaben",
-          "open_dkt": "Öffnen DKT",
+          "open_dkt": "Öffnen RDZ",
           "edit_nickname": "Spitznamen bearbeiten",
           "edit_profile_picture": "Profilbild bearbeiten",
           "remove_profile_picture": "Profilbild entfernen",
@@ -157,7 +159,8 @@ extension SettingsLocalization on String {
           "done": "Fertig",
           "reset": "Zurücksetzen",
           "open": "Öffnen",
-          "data_collected": "Erhobene Daten: Plattform (z.B. Android), App version (z.B. 3.0.0), Eindeutige Installationskennung",
+          "data_collected":
+              "Erhobene Daten: Plattform (z.B. Android), App version (z.B. 3.0.0), Eindeutige Installationskennung",
           "Analytics": "Analytik",
           "Anonymous Usage Analytics": "Anonyme Nutzungsanalyse",
           "graph_class_avg": "Klassendurchschnitt in der Grafik",

filcnaplo_kreta_api/.gitignore

@@ -1,47 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# Web related
-lib/generated_plugin_registrant.dart
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
-pubspec.lock

filcnaplo_kreta_api/lib/client/api.dart

@@ -3,6 +3,7 @@ import 'package:intl/intl.dart';
 class KretaAPI {
   // IDP API
   static const login = BaseKreta.kretaIdp + KretaApiEndpoints.token;
+  static const logout = BaseKreta.kretaIdp + KretaApiEndpoints.revoke;
   static const nonce = BaseKreta.kretaIdp + KretaApiEndpoints.nonce;
   static const clientId = "kreta-ellenorzo-mobile-android";
 
@@ -24,6 +25,11 @@ class KretaAPI {
       KretaApiEndpoints.groupAverages +
       "?oktatasiNevelesiFeladatUid=" +
       uid;
+  static String averages(String iss, String uid) =>
+      BaseKreta.kreta(iss) +
+      KretaApiEndpoints.averages +
+      "?oktatasiNevelesiFeladatUid=" +
+      uid;
   static String timetable(String iss, {DateTime? start, DateTime? end}) =>
       BaseKreta.kreta(iss) +
       KretaApiEndpoints.timetable +
@@ -48,6 +54,30 @@ class KretaAPI {
           String iss, String uid, String type) =>
       BaseKreta.kreta(iss) +
       KretaApiEndpoints.downloadHomeworkAttachments(uid, type);
+  static String subjects(String iss, String uid) =>
+      BaseKreta.kreta(iss) +
+      KretaApiEndpoints.subjects +
+      "?oktatasiNevelesiFeladatUid=" + uid;
+      // Structure:
+      // {
+      //   "Uid": 000,
+      //   "Tantargy": {
+      //       "Uid": 000,
+      //       "Nev": "Irodalom",
+      //       "Kategoria": {
+      //          "Uid": "000,magyar_nyelv_es_irodalom",
+      //          "Nev": "magyar_nyelv_es_irodalom",
+      //          "Leiras": "Magyar nyelv és irodalom"
+      //       },
+      //       "SortIndex": 0,
+      //    },
+      //    "Atlag": null, // float
+      //    "AtlagAlakulasaIdoFuggvenyeben": Array[], // no idea what this is
+      //    "SulyozottOsztalyzatOsszege": null, // int | float
+      //    "SulyozottOsztalyzatSzama": null, // int | float
+      //    "SortIndex": 0
+      // }
+      // refer to https://discord.com/channels/1111649116020285532/1111798771513303102/1148368925969612920
 
   // ADMIN API
   static const sendMessage =
@@ -81,6 +111,7 @@ class BaseKreta {
 
 class KretaApiEndpoints {
   static const token = "/connect/token";
+  static const revoke = "/connect/revocation";
   static const nonce = "/nonce";
   static const notes = "/ellenorzo/V3/Sajat/Feljegyzesek";
   static const events = "/ellenorzo/V3/Sajat/FaliujsagElemek";
@@ -90,6 +121,7 @@ class KretaApiEndpoints {
   static const groups = "/ellenorzo/V3/Sajat/OsztalyCsoportok";
   static const groupAverages =
       "/ellenorzo/V3/Sajat/Ertekelesek/Atlagok/OsztalyAtlagok";
+  static const averages = "/ellenorzo/V3/idk";
   static const timetable = "/ellenorzo/V3/Sajat/OrarendElemek";
   static const exams = "/ellenorzo/V3/Sajat/BejelentettSzamonkeresek";
   static const homework = "/ellenorzo/V3/Sajat/HaziFeladatok";
@@ -97,6 +129,7 @@ class KretaApiEndpoints {
   static const capabilities = "/ellenorzo/V3/Sajat/Intezmenyek";
   static String downloadHomeworkAttachments(String uid, String type) =>
       "/ellenorzo/V3/Sajat/Csatolmany/$uid";
+  static const subjects = "/ellenorzo/V3/Sajat/Ertekelesek/Atlagok/TantargyiAtlagok";
 }
 
 class KretaAdminEndpoints {

filcnaplo_kreta_api/lib/client/client.dart

@@ -26,6 +26,8 @@ class KretaClient {
   late final UserProvider _user;
   late final StatusProvider _status;
 
+  bool _loginRefreshing = false;
+
   KretaClient({
     this.accessToken,
     required SettingsProvider settings,
@@ -89,6 +91,9 @@ class KretaClient {
       }
 
       if (res == null) throw "Login error";
+      if (res.body == 'invalid_grant' || res.body.replaceAll(' ', '') == '') {
+        throw "Auth error";
+      }
 
       if (json) {
         return jsonDecode(res.body);
@@ -161,6 +166,9 @@ class KretaClient {
   }
 
   Future<void> refreshLogin() async {
+    if (_loginRefreshing) return;
+    _loginRefreshing = true;
+
     User? loginUser = _user.user;
     if (loginUser == null) return;
 
@@ -179,13 +187,15 @@ class KretaClient {
       print("DEBUG: refreshLogin: ${loginUser.id} ${loginUser.name}");
     }
 
-    Map? loginRes = await postAPI(KretaAPI.login,
+    Map? loginRes = await postAPI(
-        headers: headers,
+      KretaAPI.login,
-        body: User.loginBody(
+      headers: headers,
-          username: loginUser.username,
+      body: User.loginBody(
-          password: loginUser.password,
+        username: loginUser.username,
-          instituteCode: loginUser.instituteCode,
+        password: loginUser.password,
-        ));
+        instituteCode: loginUser.instituteCode,
+      ),
+    );
 
     if (loginRes != null) {
       if (loginRes.containsKey("access_token")) {
@@ -212,5 +222,25 @@ class KretaClient {
         }
       }
     }
+
+    _loginRefreshing = false;
+  }
+
+  Future<void> logout() async {
+    User? loginUser = _user.user;
+    if (loginUser == null) return;
+
+    Map<String, String> headers = {
+      "content-type": "application/x-www-form-urlencoded",
+    };
+
+    await postAPI(
+      KretaAPI.logout,
+      headers: headers,
+      body: User.logoutBody(
+        refreshToken: refreshToken!,
+      ),
+      json: false,
+    );
   }
 }

filcnaplo_kreta_api/lib/models/absence.dart

@@ -13,7 +13,7 @@ class Absence {
   Category? justification;
   Category? type;
   Category? mode;
-  Subject subject;
+  GradeSubject subject;
   DateTime lessonStart;
   DateTime lessonEnd;
   int? lessonIndex;
@@ -83,7 +83,7 @@ class Absence {
           : null,
       type: json["Tipus"] != null ? Category.fromJson(json["Tipus"]) : null,
       mode: json["Mod"] != null ? Category.fromJson(json["Mod"]) : null,
-      subject: Subject.fromJson(json["Tantargy"] ?? {}),
+      subject: GradeSubject.fromJson(json["Tantargy"] ?? {}),
       lessonStart: lessonStart,
       lessonEnd: lessonEnd,
       lessonIndex: lessonIndex,

filcnaplo_kreta_api/lib/models/exam.dart

@@ -1,3 +1,5 @@
+import 'package:filcnaplo_kreta_api/models/subject.dart';
+
 import 'category.dart';
 import 'teacher.dart';
 
@@ -6,8 +8,9 @@ class Exam {
   DateTime date;
   DateTime writeDate;
   Category? mode;
-  int? subjectIndex;
+  // int? subjectIndex;
-  String subjectName;
+  // String subjectName;
+  GradeSubject subject;
   Teacher teacher;
   String description;
   String group;
@@ -18,8 +21,9 @@ class Exam {
     required this.date,
     required this.writeDate,
     this.mode,
-    this.subjectIndex,
+    // this.subjectIndex,
-    required this.subjectName,
+    // required this.subjectName,
+    required this.subject,
     required this.teacher,
     required this.description,
     required this.group,
@@ -36,8 +40,9 @@ class Exam {
           ? DateTime.parse(json["Datum"]).toLocal()
           : DateTime(0),
       mode: json["Modja"] != null ? Category.fromJson(json["Modja"]) : null,
-      subjectIndex: json["OrarendiOraOraszama"],
+      // subjectIndex: json["OrarendiOraOraszama"],
-      subjectName: json["TantargyNeve"] ?? "",
+      // subjectName: json["TantargyNeve"] ?? "",
+      subject: GradeSubject.fromJson(json["Tantargy"] ?? {}),
       teacher: Teacher.fromString((json["RogzitoTanarNeve"] ?? "").trim()),
       description: (json["Temaja"] ?? "").trim(),
       group: json["OsztalyCsoport"] != null

filcnaplo_kreta_api/lib/models/grade.dart

@@ -12,7 +12,7 @@ class Grade {
   String description;
   GradeType type;
   String groupId;
-  Subject subject;
+  GradeSubject subject;
   Category? gradeType;
   Category mode;
   DateTime writeDate;
@@ -57,7 +57,7 @@ class Grade {
           ? Category.getGradeType(json["Tipus"]["Nev"])
           : GradeType.unknown,
       groupId: (json["OsztalyCsoport"] ?? {})["Uid"] ?? "",
-      subject: Subject.fromJson(json["Tantargy"] ?? {}),
+      subject: GradeSubject.fromJson(json["Tantargy"] ?? {}),
       gradeType: json["ErtekFajta"] != null
           ? Category.fromJson(json["ErtekFajta"])
           : null,

filcnaplo_kreta_api/lib/models/group_average.dart

@@ -3,7 +3,7 @@ import 'package:filcnaplo_kreta_api/models/subject.dart';
 class GroupAverage {
   String uid;
   double average;
-  Subject subject;
+  GradeSubject subject;
   Map json;
 
   GroupAverage({required this.uid, required this.average, required this.subject, this.json = const {}});
@@ -12,7 +12,7 @@ class GroupAverage {
     return GroupAverage(
       uid: json["Uid"] ?? "",
       average: json["OsztalyCsoportAtlag"] ?? 0,
-      subject: Subject.fromJson(json["Tantargy"] ?? {}),
+      subject: GradeSubject.fromJson(json["Tantargy"] ?? {}),
       json: json,
     );
   }

filcnaplo_kreta_api/lib/models/homework.dart

@@ -12,7 +12,7 @@ class Homework {
   bool homeworkEnabled;
   Teacher teacher;
   String content;
-  Subject subject;
+  GradeSubject subject;
   String group;
   List<HomeworkAttachment> attachments;
   String id;
@@ -48,7 +48,7 @@ class Homework {
       homeworkEnabled: json["IsTanuloHaziFeladatEnabled"] ?? false,
       teacher: Teacher.fromString((json["RogzitoTanarNeve"] ?? "").trim()),
       content: (json["Szoveg"] ?? "").trim(),
-      subject: Subject.fromJson(json["Tantargy"] ?? {}),
+      subject: GradeSubject.fromJson(json["Tantargy"] ?? {}),
       group: json["OsztalyCsoport"] != null
           ? json["OsztalyCsoport"]["Uid"] ?? ""
           : "",

filcnaplo_kreta_api/lib/models/lesson.dart

@@ -6,7 +6,7 @@ class Lesson {
   Map? json;
   Category? status;
   DateTime date;
-  Subject subject;
+  GradeSubject subject;
   String lessonIndex;
   int? lessonYearIndex;
   Teacher? substituteTeacher;
@@ -68,7 +68,7 @@ class Lesson {
         date: json["Datum"] != null
             ? DateTime.parse(json["Datum"]).toLocal()
             : DateTime(0),
-        subject: Subject.fromJson(json["Tantargy"] ?? {}),
+        subject: GradeSubject.fromJson(json["Tantargy"] ?? {}),
         lessonIndex: json["Oraszam"] != null ? json["Oraszam"].toString() : "+",
         lessonYearIndex: json["OraEvesSorszama"],
         substituteTeacher: json["HelyettesTanarNeve"] != null

filcnaplo_kreta_api/lib/models/subject.dart

@@ -1,6 +1,6 @@
 import 'category.dart';
 
-class Subject {
+class GradeSubject {
   String id;
   Category category;
   String name;
@@ -8,11 +8,16 @@ class Subject {
 
   bool get isRenamed => renamedTo != null;
 
-  Subject({required this.id, required this.category, required this.name, this.renamedTo});
+  GradeSubject({
+    required this.id,
+    required this.category,
+    required this.name,
+    this.renamedTo,
+  });
 
-  factory Subject.fromJson(Map json) {
+  factory GradeSubject.fromJson(Map json) {
     final id = json["Uid"] ?? "";
-    return Subject(
+    return GradeSubject(
       id: id,
       category: Category.fromJson(json["Kategoria"] ?? {}),
       name: (json["Nev"] ?? "").trim(),
@@ -21,7 +26,7 @@ class Subject {
 
   @override
   bool operator ==(other) {
-    if (other is! Subject) return false;
+    if (other is! GradeSubject) return false;
     return id == other.id;
   }
 

filcnaplo_kreta_api/lib/providers/exam_provider.dart

@@ -27,19 +27,49 @@ class ExamProvider with ChangeNotifier {
 
     // Load exams from the database
     if (userId != null) {
-      var dbExams = await Provider.of<DatabaseProvider>(_context, listen: false).userQuery.getExams(userId: userId);
+      var dbExams = await Provider.of<DatabaseProvider>(_context, listen: false)
+          .userQuery
+          .getExams(userId: userId);
       _exams = dbExams;
       notifyListeners();
+      await convertBySettings();
     }
   }
 
+  // for renamed subjects
+  Future<void> convertBySettings() async {
+    final _database = Provider.of<DatabaseProvider>(_context, listen: false);
+    Map<String, String> renamedSubjects =
+        (await _database.query.getSettings(_database)).renamedSubjectsEnabled
+            ? await _database.userQuery.renamedSubjects(
+                userId:
+                    Provider.of<UserProvider>(_context, listen: false).user!.id)
+            : {};
+    Map<String, String> renamedTeachers =
+        (await _database.query.getSettings(_database)).renamedTeachersEnabled
+            ? await _database.userQuery.renamedTeachers(
+                userId:
+                    Provider.of<UserProvider>(_context, listen: false).user!.id)
+            : {};
+
+    for (Exam exam in _exams) {
+      exam.subject.renamedTo =
+          renamedSubjects.isNotEmpty ? renamedSubjects[exam.subject.id] : null;
+      exam.teacher.renamedTo =
+          renamedTeachers.isNotEmpty ? renamedTeachers[exam.teacher.id] : null;
+    }
+
+    notifyListeners();
+  }
+
   // Fetches Exams from the Kreta API then stores them in the database
   Future<void> fetch() async {
     User? user = Provider.of<UserProvider>(_context, listen: false).user;
     if (user == null) throw "Cannot fetch Exams for User null";
     String iss = user.instituteCode;
 
-    List? examsJson = await Provider.of<KretaClient>(_context, listen: false).getAPI(KretaAPI.exams(iss));
+    List? examsJson = await Provider.of<KretaClient>(_context, listen: false)
+        .getAPI(KretaAPI.exams(iss));
     if (examsJson == null) throw "Cannot fetch Exams for User ${user.id}";
     List<Exam> exams = examsJson.map((e) => Exam.fromJson(e)).toList();
 
@@ -52,8 +82,11 @@ class ExamProvider with ChangeNotifier {
     if (user == null) throw "Cannot store Exams for User null";
     String userId = user.id;
 
-    await Provider.of<DatabaseProvider>(_context, listen: false).userStore.storeExams(exams, userId: userId);
+    await Provider.of<DatabaseProvider>(_context, listen: false)
+        .userStore
+        .storeExams(exams, userId: userId);
     _exams = exams;
     notifyListeners();
+    await convertBySettings();
   }
 }

filcnaplo_kreta_api/lib/providers/homework_provider.dart

@@ -1,16 +1,17 @@
 import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/api/providers/database_provider.dart';
-import 'package:filcnaplo/models/settings.dart';
+// import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/models/user.dart';
 import 'package:filcnaplo_kreta_api/client/api.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
 import 'package:filcnaplo_kreta_api/models/homework.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 class HomeworkProvider with ChangeNotifier {
   // Private
-  late final SettingsProvider _settings;
+  // late final SettingsProvider _settings;
   late final UserProvider _user;
   late final DatabaseProvider _database;
 
@@ -23,10 +24,12 @@ class HomeworkProvider with ChangeNotifier {
     List<Homework> initialHomework = const [],
     required BuildContext context,
     required DatabaseProvider database,
+    required UserProvider user,
   }) {
     _homework = List.castFrom(initialHomework);
     _context = context;
     _database = database;
+    _user = user;
 
     if (_homework.isEmpty) restore();
   }
@@ -73,23 +76,36 @@ class HomeworkProvider with ChangeNotifier {
     if (user == null) throw "Cannot fetch Homework for User null";
 
     String iss = user.instituteCode;
-    List? homeworkJson = await Provider.of<KretaClient>(_context, listen: false)
+
-        .getAPI(KretaAPI.homework(iss, start: from));
+    List? homeworkJson = [];
-    if (homeworkJson == null) throw "Cannot fetch Homework for User ${user.id}";
+
+    try {
+      Iterable hwjson = await Provider.of<KretaClient>(_context, listen: false)
+          .getAPI(KretaAPI.homework(iss, start: from));
+      homeworkJson = List.from(hwjson.map((model) => model));
+    } catch (e) {
+      if (kDebugMode) print(e);
+      // error fetcing homework (unknown error)
+    }
+
+    if (homeworkJson == null) {
+      if (kDebugMode) print("Cannot fetch Homework for User ${user.id}");
+      return;
+    }
 
     List<Homework> homework = [];
     await Future.forEach(homeworkJson.cast<Map>(), (Map hw) async {
       Map? e = await Provider.of<KretaClient>(_context, listen: false)
           .getAPI(KretaAPI.homework(iss, id: hw["Uid"]));
-      Map<String, String> renamedSubjects = _settings.renamedSubjectsEnabled
+      // Map<String, String> renamedSubjects = _settings.renamedSubjectsEnabled
-          ? await _database.userQuery.renamedSubjects(userId: _user.user!.id)
+      //     ? await _database.userQuery.renamedSubjects(userId: _user.user!.id)
-          : {};
+      //     : {};
 
       if (e != null) {
-        Homework hw = Homework.fromJson(e);
+        Homework hmwrk = Homework.fromJson(e);
-        hw.subject.renamedTo =
+        // hw.subject.renamedTo =
-            renamedSubjects.isNotEmpty ? renamedSubjects[hw.subject.id] : null;
+        //     renamedSubjects.isNotEmpty ? renamedSubjects[hw.subject.id] : null;
-        homework.add(hw);
+        homework.add(hmwrk);
       }
     });
 
@@ -98,6 +114,7 @@ class HomeworkProvider with ChangeNotifier {
     if (db) await store(homework);
     _homework = homework;
     notifyListeners();
+    await convertBySettings();
   }
 
   // Stores Homework in the database

filcnaplo_kreta_api/lib/providers/subject_provider.dart

@@ -0,0 +1,165 @@
+// import 'package:filcnaplo/api/providers/user_provider.dart';
+// import 'package:filcnaplo/api/providers/database_provider.dart';
+// import 'package:filcnaplo/models/settings.dart';
+// import 'package:filcnaplo/models/user.dart';
+// import 'package:filcnaplo_kreta_api/client/api.dart';
+// import 'package:filcnaplo_kreta_api/client/client.dart';
+// import 'package:filcnaplo_kreta_api/models/grade.dart';
+// import 'package:filcnaplo_kreta_api/models/group_average.dart';
+// import 'package:filcnaplo_kreta_api/providers/grade_provider.i18n.dart';
+// import 'package:flutter/material.dart';
+
+// class SubjectProvider with ChangeNotifier {
+//   // Private
+//   late List<Grade> _grades;
+//   late DateTime _lastSeen;
+//   late String _groups;
+//   List<GroupAverage> _groupAvg = [];
+//   late final SettingsProvider _settings;
+//   late final UserProvider _user;
+//   late final DatabaseProvider _database;
+//   late final KretaClient _kreta;
+
+//   // Public
+//   List<Grade> get grades => _grades;
+//   DateTime get lastSeenDate =>
+//       _settings.gradeOpeningFun ? _lastSeen : DateTime(3000);
+//   String get groups => _groups;
+//   List<GroupAverage> get groupAverages => _groupAvg;
+
+//   SubjectProvider({
+//     List<Grade> initialGrades = const [],
+//     required SettingsProvider settings,
+//     required UserProvider user,
+//     required DatabaseProvider database,
+//     required KretaClient kreta,
+//   }) {
+//     _settings = settings;
+//     _user = user;
+//     _database = database;
+//     _kreta = kreta;
+
+//     _grades = List.castFrom(initialGrades);
+//     _lastSeen = DateTime.now();
+
+//     if (_grades.isEmpty) restore();
+//   }
+
+//   Future<void> seenAll() async {
+//     String? userId = _user.id;
+//     if (userId != null) {
+//       final userStore = _database.userStore;
+//       userStore.storeLastSeenGrade(DateTime.now(), userId: userId);
+//       _lastSeen = DateTime.now();
+//     }
+//   }
+
+//   Future<void> restore() async {
+//     String? userId = _user.id;
+
+//     // Load grades from the database
+//     if (userId != null) {
+//       final userQuery = _database.userQuery;
+
+//       _grades = await userQuery.getGrades(userId: userId);
+//       await convertBySettings();
+//       _groupAvg = await userQuery.getGroupAverages(userId: userId);
+//       notifyListeners();
+//       DateTime lastSeenDB = await userQuery.lastSeenGrade(userId: userId);
+//       if (lastSeenDB.millisecondsSinceEpoch == 0 ||
+//           lastSeenDB.year == 0 ||
+//           !_settings.gradeOpeningFun) {
+//         _lastSeen = DateTime.now();
+//         await seenAll();
+//       } else {
+//         _lastSeen = lastSeenDB;
+//       }
+//       notifyListeners();
+//     }
+//   }
+
+//   // good student mode, renamed subjects
+//   Future<void> convertBySettings() async {
+//     Map<String, String> renamedSubjects = _settings.renamedSubjectsEnabled
+//         ? await _database.userQuery.renamedSubjects(userId: _user.user!.id)
+//         : {};
+//     Map<String, String> renamedTeachers = _settings.renamedTeachersEnabled
+//         ? await _database.userQuery.renamedTeachers(userId: _user.user!.id)
+//         : {};
+
+//     for (Grade grade in _grades) {
+//       grade.subject.renamedTo =
+//           renamedSubjects.isNotEmpty ? renamedSubjects[grade.subject.id] : null;
+//       grade.teacher.renamedTo =
+//           renamedTeachers.isNotEmpty ? renamedTeachers[grade.teacher.id] : null;
+
+//       grade.value.value =
+//           _settings.goodStudent ? 5 : grade.json!["SzamErtek"] ?? 0;
+//       grade.value.valueName = _settings.goodStudent
+//           ? "Jeles".i18n
+//           : '${grade.json!["SzovegesErtek"]}'
+//               .replaceAll(RegExp(r'[(]+[12345]?[)]'), '')
+//               .i18n;
+//       grade.value.shortName = _settings.goodStudent
+//           ? "Jeles".i18n
+//           : '${grade.json!["SzovegesErtekelesRovidNev"]}' != "null" &&
+//                   '${grade.json!["SzovegesErtekelesRovidNev"]}' != "-" &&
+//                   '${grade.json!["SzovegesErtekelesRovidNev"]}'
+//                           .replaceAll(RegExp(r'[0123456789]+[%]?'), '') !=
+//                       ""
+//               ? '${grade.json!["SzovegesErtekelesRovidNev"]}'.i18n
+//               : grade.value.valueName;
+//     }
+
+//     notifyListeners();
+//   }
+
+//   // fetch subjects from kreten then store them
+//   Future<void> fetch() async {
+//     User? user = _user.user;
+//     if (user == null) throw "Cannot fetch Subjects for User null";
+//     String iss = user.instituteCode;
+
+//     List? gradesJson = await _kreta.getAPI(KretaAPI.subjects(iss, ""));
+//     if (gradesJson == null) throw "Cannot fetch Subjects for User ${user.id}";
+//     List<Grade> grades = gradesJson.map((e) => Grade.fromJson(e)).toList();
+
+//     if (grades.isNotEmpty || _grades.isNotEmpty) await store(grades);
+
+//     List? groupsJson = await _kreta.getAPI(KretaAPI.groups(iss));
+//     if (groupsJson == null || groupsJson.isEmpty) {
+//       throw "Cannot fetch Groups for User ${user.id}";
+//     }
+//     _groups = (groupsJson[0]["OktatasNevelesiFeladat"] ?? {})["Uid"] ?? "";
+
+//     List? groupAvgJson =
+//         await _kreta.getAPI(KretaAPI.groupAverages(iss, _groups));
+//     if (groupAvgJson == null) {
+//       throw "Cannot fetch Class Averages for User ${user.id}";
+//     }
+//     final groupAvgs =
+//         groupAvgJson.map((e) => GroupAverage.fromJson(e)).toList();
+//     await storeGroupAvg(groupAvgs);
+//   }
+
+//   // store subjects in db
+//   Future<void> store(List<Grade> grades) async {
+//     User? user = _user.user;
+//     if (user == null) throw "Cannot store Grades for User null";
+//     String userId = user.id;
+
+//     await _database.userStore.storeGrades(grades, userId: userId);
+//     _grades = grades;
+//     await convertBySettings();
+//   }
+
+//   Future<void> storeGroupAvg(List<GroupAverage> groupAvgs) async {
+//     _groupAvg = groupAvgs;
+
+//     User? user = _user.user;
+//     if (user == null) throw "Cannot store Grades for User null";
+//     String userId = user.id;
+//     await _database.userStore.storeGroupAverages(groupAvgs, userId: userId);
+//     notifyListeners();
+//   }
+// }

filcnaplo_kreta_api/lib/providers/timetable_provider.dart

@@ -5,7 +5,7 @@ import 'package:filcnaplo_kreta_api/client/api.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
 import 'package:filcnaplo_kreta_api/models/lesson.dart';
 import 'package:filcnaplo_kreta_api/models/week.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/foundation.dart';
 
 class TimetableProvider with ChangeNotifier {
   Map<Week, List<Lesson>> lessons = {};
@@ -67,15 +67,21 @@ class TimetableProvider with ChangeNotifier {
     String iss = user.instituteCode;
     List? lessonsJson = await _kreta
         .getAPI(KretaAPI.timetable(iss, start: week.start, end: week.end));
-    if (lessonsJson == null) throw "Cannot fetch Lessons for User ${user.id}";
-    List<Lesson> lessonsList = lessonsJson.map((e) => Lesson.fromJson(e)).toList();
 
-    if (lessons.isEmpty && lessons.isEmpty) return;
+    if (lessonsJson == null) {
+      if (kDebugMode) print('Cannot fetch Lessons for User ${user.id}');
 
-    lessons[week] = lessonsList;
+      return;
+      // throw "Cannot fetch Lessons for User ${user.id}";
+    } else {
+      List<Lesson> lessonsList =
+          lessonsJson.map((e) => Lesson.fromJson(e)).toList();
 
-    await store();
+      lessons[week] = lessonsList;
-    await convertBySettings();
+
+      await store();
+      await convertBySettings();
+    }
   }
 
   // Stores Lessons in the database

filcnaplo_mobile_ui/.gitignore

@@ -1,47 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# Web related
-lib/generated_plugin_registrant.dart
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
-pubspec.lock

filcnaplo_mobile_ui/lib/common/panel/panel.dart

@@ -1,8 +1,12 @@
+import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/theme/colors/colors.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 class Panel extends StatelessWidget {
-  const Panel({Key? key, this.child, this.title, this.padding, this.hasShadow = true}) : super(key: key);
+  const Panel(
+      {Key? key, this.child, this.title, this.padding, this.hasShadow = true})
+      : super(key: key);
 
   final Widget? child;
   final Widget? title;
@@ -25,7 +29,9 @@ class Panel extends StatelessWidget {
               borderRadius: BorderRadius.circular(16.0),
               color: Theme.of(context).colorScheme.background,
               boxShadow: [
-                if (hasShadow)
+                if (hasShadow &&
+                    Provider.of<SettingsProvider>(context, listen: false)
+                        .shadowEffect)
                   BoxShadow(
                     offset: const Offset(0, 21),
                     blurRadius: 23.0,
@@ -51,7 +57,9 @@ class PanelTitle extends StatelessWidget {
     return Padding(
       padding: const EdgeInsets.only(left: 14.0, bottom: 8.0),
       child: DefaultTextStyle(
-        style: Theme.of(context).textTheme.titleMedium!.copyWith(fontWeight: FontWeight.w600, color: AppColors.of(context).text.withOpacity(0.65)),
+        style: Theme.of(context).textTheme.titleMedium!.copyWith(
+            fontWeight: FontWeight.w600,
+            color: AppColors.of(context).text.withOpacity(0.65)),
         child: title,
       ),
     );
@@ -69,14 +77,17 @@ class PanelHeader extends StatelessWidget {
       width: double.infinity,
       padding: padding,
       decoration: BoxDecoration(
-        borderRadius: const BorderRadius.only(topLeft: Radius.circular(16.0), topRight: Radius.circular(16.0)),
+        borderRadius: const BorderRadius.only(
+            topLeft: Radius.circular(16.0), topRight: Radius.circular(16.0)),
         color: Theme.of(context).colorScheme.background,
         boxShadow: [
-          BoxShadow(
+          if (Provider.of<SettingsProvider>(context, listen: false)
-            offset: const Offset(0, 21),
+              .shadowEffect)
-            blurRadius: 23.0,
+            BoxShadow(
-            color: Theme.of(context).shadowColor,
+              offset: const Offset(0, 21),
-          )
+              blurRadius: 23.0,
+              color: Theme.of(context).shadowColor,
+            )
         ],
       ),
     );
@@ -96,11 +107,13 @@ class PanelBody extends StatelessWidget {
       decoration: BoxDecoration(
         color: Theme.of(context).colorScheme.background,
         boxShadow: [
-          BoxShadow(
+          if (Provider.of<SettingsProvider>(context, listen: false)
-            offset: const Offset(0, 21),
+              .shadowEffect)
-            blurRadius: 23.0,
+            BoxShadow(
-            color: Theme.of(context).shadowColor,
+              offset: const Offset(0, 21),
-          )
+              blurRadius: 23.0,
+              color: Theme.of(context).shadowColor,
+            )
         ],
       ),
       padding: padding,
@@ -120,14 +133,18 @@ class PanelFooter extends StatelessWidget {
       width: double.infinity,
       padding: padding,
       decoration: BoxDecoration(
-        borderRadius: const BorderRadius.only(bottomLeft: Radius.circular(16.0), bottomRight: Radius.circular(16.0)),
+        borderRadius: const BorderRadius.only(
+            bottomLeft: Radius.circular(16.0),
+            bottomRight: Radius.circular(16.0)),
         color: Theme.of(context).colorScheme.background,
         boxShadow: [
-          BoxShadow(
+          if (Provider.of<SettingsProvider>(context, listen: false)
-            offset: const Offset(0, 21),
+              .shadowEffect)
-            blurRadius: 23.0,
+            BoxShadow(
-            color: Theme.of(context).shadowColor,
+              offset: const Offset(0, 21),
-          )
+              blurRadius: 23.0,
+              color: Theme.of(context).shadowColor,
+            )
         ],
       ),
     );

filcnaplo_mobile_ui/lib/common/personality_card/empty_card.dart

@@ -1,5 +1,7 @@
 import 'package:dotted_border/dotted_border.dart';
+import 'package:filcnaplo/models/settings.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
 class EmptyCard extends StatefulWidget {
   const EmptyCard({
@@ -39,12 +41,14 @@ class _EmptyCardState extends State<EmptyCard> {
             color: const Color(0x280008FF),
             borderRadius: const BorderRadius.all(Radius.circular(5)),
             boxShadow: [
-              BoxShadow(
+              if (Provider.of<SettingsProvider>(context, listen: false)
-                color: Colors.black.withOpacity(0.08),
+                  .shadowEffect)
-                offset: const Offset(0, 5),
+                BoxShadow(
-                blurRadius: 20,
+                  color: Colors.black.withOpacity(0.08),
-                spreadRadius: 10,
+                  offset: const Offset(0, 5),
-              ),
+                  blurRadius: 20,
+                  spreadRadius: 10,
+                ),
             ],
           ),
           child: DottedBorder(

filcnaplo_mobile_ui/lib/common/personality_card/personality_card.dart

@@ -35,12 +35,12 @@ class _PersonalityCardState extends State<PersonalityCard> {
   late SettingsProvider settings;
 
   late List<int> subjectAvgsList = [];
-  late Map<Subject, double> subjectAvgs = {};
+  late Map<GradeSubject, double> subjectAvgs = {};
   late double subjectAvg;
   late List<Grade> classWorkGrades;
   late Map<int, int> mostCommonGrade;
   late List<Absence> absences = [];
-  final Map<Subject, Lesson> _lessonCount = {};
+  final Map<GradeSubject, Lesson> _lessonCount = {};
   late int totalDelays;
   late int unexcusedAbsences;
 
@@ -48,14 +48,15 @@ class _PersonalityCardState extends State<PersonalityCard> {
 
   bool hold = false;
 
-  List<Grade> getSubjectGrades(Subject subject, {int days = 0}) => gradeProvider
+  List<Grade> getSubjectGrades(GradeSubject subject, {int days = 0}) =>
-      .grades
+      gradeProvider.grades
-      .where((e) =>
+          .where((e) =>
-          e.subject == subject &&
+              e.subject == subject &&
-          e.type == GradeType.midYear &&
+              e.type == GradeType.midYear &&
-          (days == 0 ||
+              (days == 0 ||
-              e.date.isBefore(DateTime.now().subtract(Duration(days: days)))))
+                  e.date
-      .toList();
+                      .isBefore(DateTime.now().subtract(Duration(days: days)))))
+          .toList();
 
   @override
   void initState() {
@@ -89,13 +90,13 @@ class _PersonalityCardState extends State<PersonalityCard> {
   }
 
   void getGrades() {
-    List<Subject> subjects = gradeProvider.grades
+    List<GradeSubject> subjects = gradeProvider.grades
         .map((e) => e.subject)
         .toSet()
         .toList()
       ..sort((a, b) => a.name.compareTo(b.name));
 
-    for (Subject subject in subjects) {
+    for (GradeSubject subject in subjects) {
       List<Grade> subjectGrades = getSubjectGrades(subject);
 
       double avg = AverageHelper.averageEvals(subjectGrades);

filcnaplo_mobile_ui/lib/common/soon_alert/soon_alert.dart

@@ -0,0 +1,22 @@
+import 'package:filcnaplo_mobile_ui/common/action_button.dart';
+import 'package:filcnaplo_mobile_ui/common/soon_alert/soon_alert.i18n.dart';
+import 'package:flutter/material.dart';
+
+class SoonAlert extends StatelessWidget {
+  const SoonAlert({Key? key}) : super(key: key);
+
+  static show({required BuildContext context}) =>
+      showDialog(context: context, builder: (context) => const SoonAlert());
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12.0)),
+      title: Text('soon'.i18n),
+      content: Text('soon_body'.i18n),
+      actions: [
+        ActionButton(label: "Ok", onTap: () => Navigator.of(context).pop())
+      ],
+    );
+  }
+}

filcnaplo_mobile_ui/lib/common/soon_alert/soon_alert.i18n.dart

@@ -0,0 +1,24 @@
+import 'package:i18n_extension/i18n_extension.dart';
+
+extension Localization on String {
+  static final _t = Translations.byLocale("hu_hu") +
+      {
+        "en_en": {
+          "soon": "Soon...",
+          "soon_body": "This feature is currently not available yet!",
+        },
+        "hu_hu": {
+          "soon": "Hamarosan...",
+          "soon_body": "Ez a funkció jelenleg még nem elérhető!",
+        },
+        "de_de": {
+          "soon": "Bald...",
+          "soon_body": "Diese Funktion ist derzeit noch nicht verfügbar!",
+        },
+      };
+
+  String get i18n => localize(this, _t);
+  String fill(List<Object> params) => localizeFill(this, params);
+  String plural(int value) => localizePlural(value, this, _t);
+  String version(Object modifier) => localizeVersion(modifier, this, _t);
+}

filcnaplo_mobile_ui/lib/common/widgets/absence/absence_subject_tile.dart

@@ -8,10 +8,16 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 class AbsenceSubjectTile extends StatelessWidget {
-  const AbsenceSubjectTile(this.subject, {Key? key, this.percentage = 0.0, this.excused = 0, this.unexcused = 0, this.pending = 0, this.onTap})
+  const AbsenceSubjectTile(this.subject,
+      {Key? key,
+      this.percentage = 0.0,
+      this.excused = 0,
+      this.unexcused = 0,
+      this.pending = 0,
+      this.onTap})
       : super(key: key);
 
-  final Subject subject;
+  final GradeSubject subject;
   final void Function()? onTap;
   final double percentage;
 
@@ -31,12 +37,20 @@ class AbsenceSubjectTile extends StatelessWidget {
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
         visualDensity: VisualDensity.compact,
         onTap: onTap,
-        leading: Icon(SubjectIcon.resolveVariant(subject: subject, context: context), size: 32.0),
+        leading: Icon(
+            SubjectIcon.resolveVariant(subject: subject, context: context),
+            size: 32.0),
         title: Text(
           subject.renamedTo ?? subject.name.capital(),
           maxLines: 2,
           overflow: TextOverflow.ellipsis,
-          style: TextStyle(fontWeight: FontWeight.w600, fontSize: 15.0, fontStyle: subject.isRenamed && settingsProvider.renamedSubjectsItalics ? FontStyle.italic : null),
+          style: TextStyle(
+              fontWeight: FontWeight.w600,
+              fontSize: 15.0,
+              fontStyle:
+                  subject.isRenamed && settingsProvider.renamedSubjectsItalics
+                      ? FontStyle.italic
+                      : null),
         ),
         subtitle: AbsenceDisplay(excused, unexcused, pending),
         trailing: Row(
@@ -47,7 +61,10 @@ class AbsenceSubjectTile extends StatelessWidget {
               Stack(
                 alignment: Alignment.centerRight,
                 children: [
-                  const Opacity(child: Text("100%", style: TextStyle(fontFamily: "monospace")), opacity: 0),
+                  const Opacity(
+                      child: Text("100%",
+                          style: TextStyle(fontFamily: "monospace")),
+                      opacity: 0),
                   Text(
                     percentage.round().toString() + "%",
                     style: TextStyle(

filcnaplo_mobile_ui/lib/common/widgets/absence/absence_view.dart

@@ -127,7 +127,7 @@ class AbsenceView extends StatelessWidget {
                   maxLines: 2,
                   overflow: TextOverflow.ellipsis,
                 ),
-                onPressed: () {
+                onPressed: () { // https://discord.com/channels/1111649116020285532/1149964760130002945
                   Navigator.of(context).pop();
 
                   if (outsideContext != null) {

filcnaplo_mobile_ui/lib/common/widgets/ad/ad_tile.dart

@@ -0,0 +1,53 @@
+import 'package:filcnaplo/models/ad.dart';
+import 'package:filcnaplo/theme/colors/colors.dart';
+import 'package:flutter/material.dart';
+import 'package:filcnaplo_mobile_ui/common/panel/panel_button.dart';
+import 'package:flutter_feather_icons/flutter_feather_icons.dart';
+
+class AdTile extends StatelessWidget {
+  const AdTile(this.ad, {Key? key, this.onTap, this.padding}) : super(key: key);
+
+  final Ad ad;
+  final Function()? onTap;
+  final EdgeInsetsGeometry? padding;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: padding ?? const EdgeInsets.symmetric(horizontal: 8.0),
+      child: PanelButton(
+        padding: const EdgeInsets.only(left: 8.0, right: 16.0),
+        onPressed: onTap,
+        title: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              ad.title,
+            ),
+            Text(
+              ad.description,
+              style: TextStyle(
+                fontWeight: FontWeight.w500,
+                color: AppColors.of(context).text.withOpacity(0.7),
+              ),
+            ),
+          ],
+        ),
+        leading: ad.logoUrl != null
+            ? ClipRRect(
+                borderRadius: BorderRadius.circular(50.0),
+                child: Image.network(
+                  ad.logoUrl.toString(),
+                  errorBuilder: (context, error, stackTrace) {
+                    ad.logoUrl = null;
+                    return const SizedBox();
+                  },
+                ),
+              )
+            : null,
+        trailing: const Icon(FeatherIcons.externalLink),
+      ),
+    );
+  }
+}

filcnaplo_mobile_ui/lib/common/widgets/ad/ad_viewable.dart

@@ -0,0 +1,22 @@
+import 'package:filcnaplo/models/ad.dart';
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+import 'ad_tile.dart';
+
+class AdViewable extends StatelessWidget {
+  const AdViewable(this.ad, {Key? key}) : super(key: key);
+
+  final Ad ad;
+
+  @override
+  Widget build(BuildContext context) {
+    return AdTile(
+      ad,
+      onTap: () => launchUrl(
+        ad.launchUrl,
+        mode: LaunchMode.externalApplication,
+      ),
+    );
+  }
+}

filcnaplo_mobile_ui/lib/common/widgets/exam/exam_tile.dart

@@ -6,7 +6,8 @@ import 'package:filcnaplo/utils/format.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 
 class ExamTile extends StatelessWidget {
-  const ExamTile(this.exam, {Key? key, this.onTap, this.padding}) : super(key: key);
+  const ExamTile(this.exam, {Key? key, this.onTap, this.padding})
+      : super(key: key);
 
   final Exam exam;
   final void Function()? onTap;
@@ -22,26 +23,32 @@ class ExamTile extends StatelessWidget {
           visualDensity: VisualDensity.compact,
           contentPadding: const EdgeInsets.only(left: 8.0, right: 12.0),
           onTap: onTap,
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14.0)),
+          shape:
+              RoundedRectangleBorder(borderRadius: BorderRadius.circular(14.0)),
           leading: SizedBox(
               width: 44,
               height: 44,
               child: Padding(
                 padding: const EdgeInsets.only(top: 2.0),
                 child: Icon(
-                  SubjectIcon.resolveVariant(subjectName: exam.subjectName, context: context),
+                  SubjectIcon.resolveVariant(
+                      subject: exam.subject, context: context),
                   size: 28.0,
                   color: AppColors.of(context).text.withOpacity(.75),
                 ),
               )),
           title: Text(
-            exam.description != "" ? exam.description : (exam.mode?.description ?? "Számonkérés"),
+            exam.description != ""
+                ? exam.description
+                : (exam.mode?.description ?? "Számonkérés"),
             maxLines: 2,
             overflow: TextOverflow.ellipsis,
             style: const TextStyle(fontWeight: FontWeight.w600),
           ),
           subtitle: Text(
-            exam.subjectName.capital(),
+            exam.subject.isRenamed
+                ? exam.subject.renamedTo!
+                : exam.subject.name.capital(),
             maxLines: 1,
             overflow: TextOverflow.ellipsis,
             style: const TextStyle(fontWeight: FontWeight.w500),

filcnaplo_mobile_ui/lib/common/widgets/exam/exam_view.dart

@@ -29,13 +29,15 @@ class ExamView extends StatelessWidget {
               padding: const EdgeInsets.only(left: 6.0),
               child: Icon(
                 SubjectIcon.resolveVariant(
-                    subjectName: exam.subjectName, context: context),
+                    subject: exam.subject, context: context),
                 size: 36.0,
                 color: AppColors.of(context).text.withOpacity(.75),
               ),
             ),
             title: Text(
-              exam.subjectName.capital(),
+              exam.subject.isRenamed
+                  ? exam.subject.renamedTo!
+                  : exam.subject.name.capital(),
               maxLines: 1,
               overflow: TextOverflow.ellipsis,
               style: const TextStyle(fontWeight: FontWeight.w600),

filcnaplo_mobile_ui/lib/common/widgets/grade/grade_subject_tile.dart

@@ -16,7 +16,7 @@ class GradeSubjectTile extends StatelessWidget {
       this.averageBefore = 0.0})
       : super(key: key);
 
-  final Subject subject;
+  final GradeSubject subject;
   final void Function()? onTap;
   final double average;
   final double groupAverage;
@@ -56,7 +56,10 @@ class GradeSubjectTile extends StatelessWidget {
               fontWeight: FontWeight.w600,
               fontSize: 14.0,
               color: textColor,
-              fontStyle: settingsProvider.renamedSubjectsItalics && subject.isRenamed ? FontStyle.italic : null),
+              fontStyle:
+                  settingsProvider.renamedSubjectsItalics && subject.isRenamed
+                      ? FontStyle.italic
+                      : null),
         ),
         trailing: Row(
           mainAxisSize: MainAxisSize.min,

filcnaplo_mobile_ui/lib/common/widgets/homework/homework_tile.dart

@@ -46,7 +46,7 @@ class HomeworkTile extends StatelessWidget {
                     padding: const EdgeInsets.only(top: 2.0),
                     child: Icon(
                       SubjectIcon.resolveVariant(
-                          subjectName: homework.subject.name, context: context),
+                          subject: homework.subject, context: context),
                       size: 28.0,
                       color: AppColors.of(context).text.withOpacity(.75),
                     ),
@@ -69,7 +69,12 @@ class HomeworkTile extends StatelessWidget {
                   homework.subject.renamedTo ?? homework.subject.name.capital(),
                   maxLines: 2,
                   overflow: TextOverflow.ellipsis,
-                  style: TextStyle(fontWeight: FontWeight.w600, fontStyle: homework.subject.isRenamed && settingsProvider.renamedSubjectsItalics ? FontStyle.italic : null),
+                  style: TextStyle(
+                      fontWeight: FontWeight.w600,
+                      fontStyle: homework.subject.isRenamed &&
+                              settingsProvider.renamedSubjectsItalics
+                          ? FontStyle.italic
+                          : null),
                 ),
           subtitle: censored
               ? Wrap(

filcnaplo_mobile_ui/lib/common/widgets/homework/homework_view.dart

@@ -44,7 +44,7 @@ class HomeworkView extends StatelessWidget {
           ListTile(
             leading: Icon(
               SubjectIcon.resolveVariant(
-                  subjectName: homework.subject.name, context: context),
+                  subject: homework.subject, context: context),
               size: 36.0,
             ),
             title: Text(

filcnaplo_mobile_ui/lib/common/widgets/lesson/changed_lesson_tile.dart

@@ -57,9 +57,9 @@ class ChangedLessonTile extends StatelessWidget {
             ),
           ),
           title: Text(
-            lesson.substituteTeacher?.name != ""
+            lesson.status?.name == "Elmaradt" && lesson.substituteTeacher?.name != ""
-                ? "substituted".i18n
+                ? "cancelled".i18n
-                : "cancelled".i18n,
+                : "substituted".i18n,
             maxLines: 2,
             overflow: TextOverflow.ellipsis,
             style: const TextStyle(fontWeight: FontWeight.w600),

filcnaplo_mobile_ui/lib/common/widgets/missed_exam/missed_exam_view.dart

@@ -15,7 +15,8 @@ class MissedExamView extends StatelessWidget {
 
   final List<Lesson> missedExams;
 
-  static show(List<Lesson> missedExams, {required BuildContext context}) => showRoundedModalBottomSheet(context, child: MissedExamView(missedExams));
+  static show(List<Lesson> missedExams, {required BuildContext context}) =>
+      showRoundedModalBottomSheet(context, child: MissedExamView(missedExams));
 
   @override
   Widget build(BuildContext context) {
@@ -25,7 +26,8 @@ class MissedExamView extends StatelessWidget {
 }
 
 class MissedExamViewTile extends StatelessWidget {
-  const MissedExamViewTile(this.lesson, {Key? key, this.padding}) : super(key: key);
+  const MissedExamViewTile(this.lesson, {Key? key, this.padding})
+      : super(key: key);
 
   final EdgeInsetsGeometry? padding;
   final Lesson lesson;
@@ -33,23 +35,36 @@ class MissedExamViewTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     SettingsProvider settingsProvider = Provider.of<SettingsProvider>(context);
+
+    String? teacherName = lesson.teacher.isRenamed
+        ? lesson.teacher.renamedTo
+        : lesson.teacher.name;
+
     return Material(
       type: MaterialType.transparency,
       child: Padding(
-        padding: padding ?? const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
+        padding: padding ??
+            const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
         child: ListTile(
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
+          shape:
+              RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
           leading: Icon(
-            SubjectIcon.resolveVariant(subject: lesson.subject, context: context),
+            SubjectIcon.resolveVariant(
+                subject: lesson.subject, context: context),
             color: AppColors.of(context).text.withOpacity(.8),
             size: 32.0,
           ),
           title: Text(
             "${lesson.subject.renamedTo ?? lesson.subject.name.capital()} • ${lesson.date.format(context)}",
-            style: TextStyle(fontWeight: FontWeight.w600, fontStyle: lesson.subject.isRenamed && settingsProvider.renamedSubjectsItalics ? FontStyle.italic : null),
+            style: TextStyle(
+                fontWeight: FontWeight.w600,
+                fontStyle: lesson.subject.isRenamed &&
+                        settingsProvider.renamedSubjectsItalics
+                    ? FontStyle.italic
+                    : null),
           ),
           subtitle: Text(
-            "missed_exam_contact".i18n.fill([lesson.teacher]),
+            "missed_exam_contact".i18n.fill([teacherName ?? '']),
             style: const TextStyle(fontWeight: FontWeight.w500),
           ),
           trailing: const Icon(FeatherIcons.arrowRight),

filcnaplo_mobile_ui/lib/common/widgets/statistics_tile.dart

@@ -1,7 +1,9 @@
 import 'package:auto_size_text/auto_size_text.dart';
+import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/ui/widgets/grade/grade_tile.dart';
 import 'package:flutter/material.dart';
 import 'package:i18n_extension/i18n_widget.dart';
+import 'package:provider/provider.dart';
 
 class StatisticsTile extends StatelessWidget {
   const StatisticsTile({
@@ -31,7 +33,9 @@ class StatisticsTile extends StatelessWidget {
     } else {
       valueText = value.toStringAsFixed(0);
     }
-    if (I18n.of(context).locale.languageCode != "en") valueText = valueText.replaceAll(".", ",");
+    if (I18n.of(context).locale.languageCode != "en") {
+      valueText = valueText.replaceAll(".", ",");
+    }
 
     if (value.isNaN) {
       valueText = "?";
@@ -44,11 +48,13 @@ class StatisticsTile extends StatelessWidget {
         borderRadius: BorderRadius.circular(12.0),
         color: Theme.of(context).colorScheme.background,
         boxShadow: [
-          BoxShadow(
+          if (Provider.of<SettingsProvider>(context, listen: false)
-            offset: const Offset(0, 21),
+              .shadowEffect)
-            blurRadius: 23.0,
+            BoxShadow(
-            color: Theme.of(context).shadowColor,
+              offset: const Offset(0, 21),
-          )
+              blurRadius: 23.0,
+              color: Theme.of(context).shadowColor,
+            )
         ],
       ),
       constraints: const BoxConstraints(
@@ -68,13 +74,19 @@ class StatisticsTile extends StatelessWidget {
           if (title != null) const SizedBox(height: 4.0),
           Container(
             margin: const EdgeInsets.only(top: 4.0),
-            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 4.0),
+            padding:
+                const EdgeInsets.symmetric(horizontal: 16.0, vertical: 4.0),
             decoration: BoxDecoration(
-              color: fill ? (color ?? gradeColor(context: context, value: value)).withOpacity(.2) : null,
+              color: fill
+                  ? (color ?? gradeColor(context: context, value: value))
+                      .withOpacity(.2)
+                  : null,
               border: outline || fill
                   ? Border.all(
-                      color: (color ?? gradeColor(context: context, value: value)).withOpacity(outline ? 1.0 : 0.0),
+                      color:
-                      width: fill ? 2.0 : 5.0,
+                          (color ?? gradeColor(context: context, value: value))
+                              .withOpacity(outline ? 1.0 : 0.0),
+                      width: fill ? 5.0 : 5.0,
                     )
                   : null,
               borderRadius: BorderRadius.circular(45.0),
@@ -96,7 +108,7 @@ class StatisticsTile extends StatelessWidget {
               style: TextStyle(
                 color: color ?? gradeColor(context: context, value: value),
                 fontWeight: FontWeight.w800,
-                fontSize: 32.0,
+                fontSize: 28.0,
               ),
             ),
           ),

filcnaplo_mobile_ui/lib/common/widgets/update/updates_view.dart

@@ -18,7 +18,8 @@ class UpdateView extends StatefulWidget {
 
   final Release release;
 
-  static void show(Release release, {required BuildContext context}) => showBottomCard(context: context, child: UpdateView(release));
+  static void show(Release release, {required BuildContext context}) =>
+      showBottomCard(context: context, child: UpdateView(release));
 
   @override
   _UpdateViewState createState() => _UpdateViewState();
@@ -45,7 +46,8 @@ class _UpdateViewState extends State<UpdateView> {
                   children: [
                     Text(
                       "new_update".i18n,
-                      style: const TextStyle(fontWeight: FontWeight.w700, fontSize: 18.0),
+                      style: const TextStyle(
+                          fontWeight: FontWeight.w700, fontSize: 18.0),
                     ),
                     Text(
                       "${widget.release.version}",
@@ -75,7 +77,7 @@ class _UpdateViewState extends State<UpdateView> {
               borderRadius: BorderRadius.circular(12.0),
             ),
             child: SizedBox(
-              height: 125.0,
+              height: 200.0,
               child: Markdown(
                 padding: const EdgeInsets.symmetric(horizontal: 12.0),
                 physics: const BouncingScrollPhysics(),
@@ -91,21 +93,30 @@ class _UpdateViewState extends State<UpdateView> {
               child: Row(
                 mainAxisSize: MainAxisSize.min,
                 children: [
-                  if (state == UpdateState.downloading || state == UpdateState.preparing)
+                  if (state == UpdateState.downloading ||
+                      state == UpdateState.preparing)
                     Container(
                       height: 18.0,
                       width: 18.0,
                       margin: const EdgeInsets.only(right: 8.0),
                       child: CircularProgressIndicator(
                         value: progress > 0.05 ? progress : null,
-                        color: ColorUtils.foregroundColor(AppColors.of(context).filc),
+                        color: ColorUtils.foregroundColor(
+                            AppColors.of(context).filc),
                       ),
                     ),
-                  Text(["download".i18n, "downloading".i18n, "downloading".i18n, "installing".i18n][state.index].toUpperCase()),
+                  Text([
+                    "download".i18n,
+                    "downloading".i18n,
+                    "downloading".i18n,
+                    "installing".i18n
+                  ][state.index]
+                      .toUpperCase()),
                 ],
               ),
               backgroundColor: AppColors.of(context).filc,
-              onPressed: state == UpdateState.none ? () => downloadPrecheck() : null,
+              onPressed:
+                  state == UpdateState.none ? () => downloadPrecheck() : null,
             ),
           ),
         ],
@@ -113,7 +124,8 @@ class _UpdateViewState extends State<UpdateView> {
     );
   }
 
-  String fmtSize() => "${(widget.release.downloads.first.size / 1024 / 1024).toStringAsFixed(1)} MB";
+  String fmtSize() =>
+      "${(widget.release.downloads.first.size / 1024 / 1024).toStringAsFixed(1)} MB";
 
   void downloadPrecheck() {
     final status = Provider.of<StatusProvider>(context, listen: false);
@@ -157,6 +169,7 @@ class _UpdateViewState extends State<UpdateView> {
         .then((_) => Navigator.of(context).maybePop())
         .catchError((error, stackTrace) {
           if (mounted) {
+            Navigator.of(context).maybePop();
             ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
               context: context,
               content: Text("error".i18n),

filcnaplo_mobile_ui/lib/pages/absences/absence_subject_view.dart

@@ -22,10 +22,10 @@ class AbsenceSubjectView extends StatelessWidget {
   const AbsenceSubjectView(this.subject, {Key? key, this.absences = const []})
       : super(key: key);
 
-  final Subject subject;
+  final GradeSubject subject;
   final List<Absence> absences;
 
-  static void show(Subject subject, List<Absence> absences,
+  static void show(GradeSubject subject, List<Absence> absences,
       {required BuildContext context}) {
     Navigator.of(context, rootNavigator: true)
         .push<Absence>(CupertinoPageRoute(
@@ -40,7 +40,7 @@ class AbsenceSubjectView extends StatelessWidget {
             TimetablePage.jump(context, lesson: lesson);
           } else {
             ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
-              content: Text("Cannot find lesson".i18n,
+              content: Text("lesson_not_found".i18n,
                   style: const TextStyle(color: Colors.white)),
               backgroundColor: AppColors.of(context).red,
               context: context,