Revert "Rename everything filcnaplo-related to refilc"

This reverts commit d1a9625d93.

.gitignore

@@ -1,5 +1,7 @@
 # See https://www.dartlang.org/guides/libraries/private-files
 
+.gitignore
+
 termek.txt
 .DS_Store
 filc3.properties
@@ -25,9 +27,6 @@ doc/api/
 *.js.map
 
 *.txt
-filcnaplo/linux/flutter/generated_plugin_registrant.cc
-filcnaplo/linux/flutter/generated_plugin_registrant.h
-filcnaplo/linux/flutter/generated_plugins.cmake
 filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift
 filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/connectivity_plus
 filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/dynamic_color
@@ -43,10 +42,11 @@ 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/GeneratedPluginRegistrant.swift
-filcnaplo/linux/flutter/generated_plugin_registrant.cc
-filcnaplo/linux/flutter/generated_plugin_registrant.h
-filcnaplo/linux/flutter/generated_plugins.cmake
-filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift
+filcnaplo/macos/Flutter/*
+filcnaplo/ios/Podfile.lock
 .vscode/
 key.properties
+
+.flutter-plugins*
+filcnaplo/ios/Flutter/flutter_export_environment 4.sh
+filcnaplo/ios/Flutter/Generated 4.xcconfig

.idea/libraries/Dart_SDK.xml

@@ -0,0 +1,27 @@
+<component name="libraryTable">
+  <library name="Dart SDK">
+    <CLASSES>
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/async" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/cli" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/collection" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/convert" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/core" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/developer" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/ffi" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/html" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/indexed_db" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/io" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/isolate" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/js" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/js_util" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/math" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/mirrors" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/svg" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/typed_data" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/web_audio" />
+      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/web_gl" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Android API 33, extension level 3 Platform" project-jdk-type="Android SDK" />
+</project>

.vscode/launch.json

@@ -10,17 +10,16 @@
         "--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": "filcnaplo release",
+    //   "cwd": "filcnaplo release",
+    //   "request": "launch",
+    //   "type": "dart",
+    //   "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",
@@ -28,6 +27,14 @@
       "request": "launch",
       "type": "dart",
       "flutterMode": "debug"
+    },
+    {
+      "name": "Flutter (release)",
+      "program": "lib/main.dart",
+      "cwd": "filcnaplo",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "release"
     }
   ]
 }

LICENSE

@@ -1,29 +1,661 @@
-BSD 3-Clause License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Copyright (c) 2023, reFilc
-All rights reserved.
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ 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
-modification, are permitted provided that the following conditions are met:
+                            Preamble
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
 
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <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

@@ -3,7 +3,7 @@
   <h1 align=center><b>reFilc</b></h1>
 </p>
 
-#### Nem hivatalos e-napló alkalmazás az eKRÉTA rendszerhez - tanulóktól, tanulóknak.
+#### Nem hivatalos e-napló alkalmazás az e-KRÉTA rendszerhez - tanulóktól, tanulóknak.
 
 [![Downloads](https://img.shields.io/github/downloads-pre/refilc/naplo/total?&logo=github&label=Downloads)](https://github.com/refilc/naplo/releases) &nbsp; [![Discord](https://img.shields.io/discord/1111649116020285532?logo=discord&label=Discord)](https://dc.refilc.hu)
 
@@ -12,7 +12,7 @@
 ### Clone the project
 
 ```sh
-git clone --recursive https://github.com/refilc/naplo
+git clone https://github.com/refilc/naplo
 cd naplo
 ```
 
@@ -35,10 +35,18 @@ Az összes (ugyan azon verzióhoz tartozó) contribution meg fog jelenni a relea
 
 -------
 
-# Developers
+# Team
 
-**annon:** a Filc napló készítője (ez az app a Filcen alapul)
+**kima:** head developer / project manager
 
-**kima, mog, WolfY:** fő fejlesztők
+**Reiner, pdf, Pearoo, Zizi:** community- and project manager / developer
 
-**Regő, Pearoo:** weboldal design és community management
+**vrolandd, TMarccci:** head developer
+
+**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/.metadata

@@ -4,8 +4,8 @@
 # This file should be version controlled.
 
 version:
-  revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
-  channel: beta
+  revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+  channel: stable
 
 project_type: app
 
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
-      base_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
-    - platform: macos
-      create_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
-      base_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+    - platform: web
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
 
   # User provided section
 

filcnaplo/android/app/src/main/AndroidManifest.xml

@@ -2,12 +2,14 @@
     xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo">
     <application android:name="${applicationName}" android:label="reFilc" tools:replace="android:label" android:icon="@mipmap/ic_launcher"
         android:requestLegacyExternalStorage="true">
-        <activity android:exported="true" android:name=".MainActivity"
+        <activity android:exported="true" android:name="hu.refilc.naplo.MainActivity"
             android:launchMode="singleTop" android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize"
             android:showWhenLocked="true"
             android:turnScreenOn="true">
+            <meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable"
+                android:resource="@drawable/launch_background" />
             <meta-data android:name="io.flutter.embedding.android.NormalTheme"
                 android:resource="@style/NormalTheme" />
             <intent-filter>
@@ -18,16 +20,26 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Accepts URIs that begin with https://api.filcnaplo.hu -->
+                <!-- Accepts URIs that begin with https://api.refilcapp.hu -->
                 <data
                     android:scheme="https"
-                    android:host="api.filcnaplo.hu"
-                    android:pathPrefix="/callback" />
+                    android:host="api.refilcapp.hu"
+                    android:pathPrefix="/v1/auth/callback" />
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <!-- Accepts URIs that begin with https://refilc.hu -->
+                <data
+                    android:scheme="https"
+                    android:host="refilc.hu"
+                    android:pathPrefix="/app" />
             </intent-filter>
         </activity>
         <meta-data android:name="flutterEmbedding" android:value="2" />
 
-        <receiver android:name=".widget_timetable.WidgetTimetable"
+        <receiver android:name="hu.refilc.naplo.widget_timetable.WidgetTimetable"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -43,7 +55,7 @@
                 android:resource="@xml/home_widget_test_info" />
         </receiver>
 
-        <service android:name=".widget_timetable.WidgetTimetableService"
+        <service android:name="hu.refilc.naplo.widget_timetable.WidgetTimetableService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <receiver android:name="es.antonborri.home_widget.HomeWidgetBackgroundReceiver"
@@ -57,11 +69,14 @@
             android:permission="android.permission.BIND_JOB_SERVICE" android:exported="true" />
     </application>
 
+    <meta-data android:name="flutterEmbedding" android:value="2" />
+
     <!-- Permissions -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

filcnaplo/android/app/src/main/java/hu/filc/naplo/database

@@ -1 +0,0 @@
-../../../../../../../../../filcnaplo_premium/android/database

filcnaplo/android/app/src/main/java/hu/filc/naplo/utils

@@ -1 +0,0 @@
-../../../../../../../../../filcnaplo_premium/android/utils

filcnaplo/android/app/src/main/java/hu/filc/naplo/widget_timetable

@@ -1 +0,0 @@
-../../../../../../../../../filcnaplo_premium/android/widget_timetable

filcnaplo/android/app/src/main/java/hu/refilc/naplo/MainActivity.java

@@ -2,8 +2,6 @@ package hu.refilc.naplo;
 
 import io.flutter.embedding.android.FlutterActivity;
 
-import io.flutter.embedding.engine.FlutterEngine;
-
 public class MainActivity extends FlutterActivity {
     
 }

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) {
-                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();
-            String currday = "";
-
-            String currweek = String.valueOf(Week.current().id());
-
-            JSONArray week = fecthtt.getJSONArray(currweek);
-
-            for (int i=0; i < week.length(); i++)
-            {
+            // Organize lessons into dates
+            for (int i = 0; i < week.length(); i++) {
                 try {
-                    if(i == 0) currday = week.getJSONObject(0).getString("Datum");
-                    JSONObject oraObj = week.getJSONObject(i);
-
-                    if(!currday.equals(oraObj.getString("Datum"))) {
-                        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) {
+                    JSONObject entry = week.getJSONObject(i);
+                    String date = entry.getString("Datum");
+                    dayMap.computeIfAbsent(date, k -> new JSONArray()).put(entry);
+                } catch (JSONException e) {
                     e.printStackTrace();
                 }
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
 
-        Collections.sort(gen_days, new Comparator<JSONArray>() {
-
-            public int compare(JSONArray a, JSONArray b) {
-                long valA = 0;
-                long valB = 0;
+            genDays.addAll(dayMap.values());
 
+            // Sort the 'genDays' list of JSON based on the start time of the first entry
+            genDays.sort((day1, day2) -> {
                 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);
+                    // 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;
                 }
             });
 
-        return gen_days;
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            dbManager.close();
         }
 
+        return genDays;
+    }
+
+
+
     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/drawable-v21/launch_gradient_background.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <gradient
-                android:startColor="#123323"
-                android:endColor="#20AC9B"
-                android:angle="135" />
-        </shape>
-    </item>
-</selector>

filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_background.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/launch_gradient_background" />
-    <item>
-        <bitmap android:gravity="center" android:src="@mipmap/ic_splash"/>
-    </item>
-</layer-list>

filcnaplo/android/app/src/main/res/drawable-xhdpi/launch_gradient_background.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <gradient
-                android:startColor="#123323"
-                android:endColor="#20AC9B"
-                android:angle="135" />
-        </shape>
-    </item>
-</selector>

filcnaplo/android/app/src/main/res/drawable/launch_gradient_background.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <gradient
-                android:startColor="#123323"
-                android:endColor="#20AC9B"
-                android:angle="135" />
-        </shape>
-    </item>
-</selector>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:id="@+id/main_lay"
     android:layout_height="50dp"
@@ -15,12 +16,14 @@
         android:id="@+id/tt_item_num"
         android:layout_width="50dp"
         android:layout_height="match_parent"
+        android:fontFamily="@font/montserrat_medium"
+        android:gravity="center"
+        android:text="1."
+        android:textColor="@color/filc"
+        android:textColorLink="#ff3D7BF4"
         android:textSize="30sp"
         android:textStyle="bold"
-        android:fontFamily="@font/montserrat_medium"
-        android:text="1."
-        android:gravity="center"
-        android:textColor="@color/filc"></TextView>
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/tt_item_name"
@@ -33,10 +36,11 @@
         android:text="Óra neve"
         android:maxLines="1"
         android:ellipsize="end"
-        android:layout_toLeftOf="@id/tt_item_room"
+        android:layout_toStartOf="@id/tt_item_room"
         android:gravity="center_vertical"
-        android:layout_toRightOf="@id/tt_item_num"
-        android:textColor="@color/text"></TextView>
+        android:layout_toEndOf="@id/tt_item_num"
+        android:textColor="@color/text"
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/tt_item_name_nodesc"
@@ -47,13 +51,14 @@
         android:fontFamily="@font/montserrat_medium"
         android:visibility="gone"
         android:layout_marginTop="2.5dp"
-        android:layout_toLeftOf="@id/tt_item_room"
+        android:layout_toStartOf="@id/tt_item_room"
         android:text="Óra neve"
         android:maxLines="1"
         android:ellipsize="end"
         android:gravity="center_vertical"
-        android:layout_toRightOf="@id/tt_item_num"
-        android:textColor="@color/text"></TextView>
+        android:layout_toEndOf="@id/tt_item_num"
+        android:textColor="@color/text"
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/tt_item_desc"
@@ -67,10 +72,11 @@
         android:maxLines="1"
         android:ellipsize="end"
         android:gravity="center_vertical"
-        android:layout_toRightOf="@id/tt_item_num"
-        android:layout_toLeftOf="@id/tt_item_room"
+        android:layout_toEndOf="@id/tt_item_num"
+        android:layout_toStartOf="@id/tt_item_room"
         android:layout_below="@id/tt_item_name"
-        android:textColor="@color/text_desc"></TextView>
+        android:textColor="@color/text_desc"
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/tt_item_room"
@@ -84,8 +90,9 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:gravity="center"
-        android:layout_toLeftOf="@id/tt_item_time"
-        android:textColor="@color/text_desc"></TextView>
+        android:layout_toStartOf="@id/tt_item_time"
+        android:textColor="@color/text_desc"
+        tools:ignore="HardcodedText" />
 
     <TextView
         android:id="@+id/tt_item_time"
@@ -95,11 +102,12 @@
         android:textFontWeight="500"
         android:fontFamily="@font/montserrat_medium"
         android:textStyle="bold"
-        android:layout_marginLeft="2dp"
+        android:layout_marginStart="2dp"
         android:layout_marginTop="-2dp"
         android:text="8:30\n9:10"
         android:gravity="center"
-        android:layout_alignParentRight="true"
-        android:textColor="@color/white"></TextView>
+        android:layout_alignParentEnd="true"
+        android:textColor="@color/white"
+        tools:ignore="HardcodedText" />
 
 </RelativeLayout>

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

@@ -19,10 +19,12 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:text="Empty"
+            android:text="Üres / Empty"
+            android:background="@drawable/widget_card_bottom_dark"
             android:textColor="@color/text"
             android:textSize="20sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
         <ListView
             android:id="@+id/widget_list"
@@ -43,57 +45,63 @@
             android:layout_width="match_parent"
             android:layout_height="45dp"
             android:background="@drawable/widget_card_top_dark">
+
             <ImageView
                 android:id="@+id/nav_refresh"
                 android:layout_width="40dp"
                 android:layout_height="match_parent"
+                android:layout_toStartOf="@id/nav_to_left"
                 android:clickable="true"
                 android:foreground="?android:attr/selectableItemBackground"
+                android:padding="10dp"
                 android:src="@drawable/ic_refresh_cw"
-                android:layout_toLeftOf="@id/nav_to_left"
                 android:tint="@color/text_desc"
                 tools:ignore="UseAppTint"
-                android:padding="10dp" />
+                android:focusable="true" />
 
             <ImageView
                 android:id="@+id/nav_to_left"
-                android:layout_width="50dp"
+                android:layout_width="45dp"
                 android:layout_height="match_parent"
+                android:layout_toStartOf="@id/nav_to_right"
                 android:clickable="true"
                 android:foreground="?android:attr/selectableItemBackground"
+                android:padding="10dp"
                 android:src="@drawable/ic_chevron_left"
-                android:layout_toLeftOf="@id/nav_to_right"
                 android:tint="@color/text_desc"
                 tools:ignore="UseAppTint"
-                android:padding="10dp" />
+                android:focusable="true" />
 
             <ImageView
                 android:id="@+id/nav_to_right"
-                android:layout_width="50dp"
+                android:layout_width="45dp"
                 android:layout_height="match_parent"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="5dp"
                 android:clickable="true"
                 android:foreground="?android:attr/selectableItemBackground"
+                android:padding="10dp"
                 android:src="@drawable/ic_chevron_right"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="5dp"
                 android:tint="@color/text_desc"
                 tools:ignore="UseAppTint"
-                android:padding="10dp" />
+                android:focusable="true" />
 
             <TextView
                 android:id="@+id/nav_current"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_alignParentLeft="true"
-                android:layout_marginLeft="20sp"
-                android:layout_toLeftOf="@id/nav_refresh"
+                android:layout_alignParentStart="true"
+                android:layout_marginStart="15sp"
+                android:layout_marginTop="2sp"
+                android:layout_toStartOf="@id/nav_refresh"
                 android:fontFamily="@font/montserrat_medium"
                 android:gravity="center_vertical"
                 android:maxLines="1"
-                android:text="Timetable"
+                android:text="Órarend"
                 android:textColor="@color/text"
-                android:textSize="24sp"
-                android:textStyle="bold" />
+                android:textSize="22sp"
+                android:textStyle="bold"
+                tools:ignore="HardcodedText" />
         </RelativeLayout>
     </RelativeLayout>
 
@@ -131,8 +139,9 @@
             android:text="A widget használatához, bejelentkezés szükséges."
             android:textColor="@color/black"
             android:paddingTop="10dp"
-            android:textSize="17dp"
-            android:textStyle="bold" />
+            android:textSize="17sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
         <Button
             android:id="@+id/open_login"
@@ -145,8 +154,9 @@
             android:layout_margin="10dp"
             android:textColor="@color/white"
             android:fontFamily="@font/montserrat_medium"
-            android:textSize="16dp"
-            android:textStyle="bold"/>
+            android:textSize="16sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
     </RelativeLayout>
 
@@ -185,8 +195,9 @@
             android:text="Órák a kezdőképernyőd kényelméből."
             android:textColor="@color/black"
             android:paddingTop="10dp"
-            android:textSize="16dp"
-            android:textStyle="bold" />
+            android:textSize="16sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -197,7 +208,8 @@
             android:textColor="@color/black"
             android:layout_marginTop="0dp"
             android:layout_marginHorizontal="15dp"
-            android:textSize="14dp" />
+            android:textSize="14sp"
+            tools:ignore="HardcodedText" />
 
         <Button
             android:id="@+id/buy_premium"
@@ -211,8 +223,9 @@
             android:layout_margin="10dp"
             android:textColor="#ff691A9B"
             android:fontFamily="@font/montserrat_medium"
-            android:textSize="16dp"
-            android:textStyle="bold"/>
+            android:textSize="16sp"
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
     </RelativeLayout>
 

filcnaplo/android/app/src/main/res/values-v21/styles.xml

@@ -1,12 +0,0 @@
-<resources>
-
-    <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
-        <item name="android:padding">?attr/appWidgetPadding</item>
-        <item name="android:background">@drawable/app_widget_background</item>
-    </style>
-
-    <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
-        <item name="android:padding">?attr/appWidgetPadding</item>
-        <item name="android:background">@drawable/app_widget_inner_view_background</item>
-    </style>
-</resources>

filcnaplo/android/app/src/main/res/values/colors.xml

@@ -27,7 +27,7 @@
     <color name="yellow_light">#ffFFCC00</color>
     <color name="light_yellow_light">#40FFD60A</color>
     <color name="green_light">#ff34C759</color>
-    <color name="filc_light">#ff247665</color>
+    <color name="filc_light">#ff3D7BF4</color>
     <color name="teal_light">#ff5AC8FA</color>
     <color name="blue_light">#ff007AFF</color>
     <color name="indigo_light">#ff5856D6</color>
@@ -49,7 +49,7 @@
     <color name="yellow">#ffFFD60A</color>
     <color name="light_yellow">#40FFD60A</color>
     <color name="green">#ff32D74B</color>
-    <color name="filc">#ff29826F</color>
+    <color name="filc">#ff3D7BF4</color>
     <color name="teal">#ff64D2FF</color>
     <color name="blue">#ff0A84FF</color>
     <color name="indigo">#ff5E5CE6</color>

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/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/Podfile.lock

@@ -1,237 +0,0 @@
-PODS:
-  - app_group_directory (1.0.0):
-    - Flutter
-  - background_fetch (1.1.6):
-    - Flutter
-  - connectivity_plus (0.0.1):
-    - Flutter
-    - ReachabilitySwift
-  - DKImagePickerController/Core (4.3.4):
-    - DKImagePickerController/ImageDataManager
-    - DKImagePickerController/Resource
-  - DKImagePickerController/ImageDataManager (4.3.4)
-  - DKImagePickerController/PhotoGallery (4.3.4):
-    - DKImagePickerController/Core
-    - DKPhotoGallery
-  - DKImagePickerController/Resource (4.3.4)
-  - DKPhotoGallery (0.0.17):
-    - DKPhotoGallery/Core (= 0.0.17)
-    - DKPhotoGallery/Model (= 0.0.17)
-    - DKPhotoGallery/Preview (= 0.0.17)
-    - DKPhotoGallery/Resource (= 0.0.17)
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Core (0.0.17):
-    - DKPhotoGallery/Model
-    - DKPhotoGallery/Preview
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Model (0.0.17):
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Preview (0.0.17):
-    - DKPhotoGallery/Model
-    - DKPhotoGallery/Resource
-    - SDWebImage
-    - SwiftyGif
-  - DKPhotoGallery/Resource (0.0.17):
-    - SDWebImage
-    - SwiftyGif
-  - file_picker (0.0.1):
-    - DKImagePickerController/PhotoGallery
-    - Flutter
-  - Flutter (1.0.0)
-  - flutter_custom_tabs (0.0.1):
-    - Flutter
-  - flutter_image_compress (1.0.0):
-    - Flutter
-    - Mantle
-    - SDWebImage
-    - SDWebImageWebPCoder
-  - flutter_local_notifications (0.0.1):
-    - Flutter
-  - flutter_native_image (0.0.1):
-    - Flutter
-  - flutter_native_splash (0.0.1):
-    - Flutter
-  - FMDB (2.7.5):
-    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.5)
-  - home_widget (0.0.1):
-    - Flutter
-  - image_picker_ios (0.0.1):
-    - Flutter
-  - libwebp (1.2.4):
-    - libwebp/demux (= 1.2.4)
-    - libwebp/mux (= 1.2.4)
-    - libwebp/webp (= 1.2.4)
-  - libwebp/demux (1.2.4):
-    - libwebp/webp
-  - libwebp/mux (1.2.4):
-    - libwebp/demux
-  - libwebp/webp (1.2.4)
-  - live_activities (0.0.1):
-    - Flutter
-  - Mantle (2.2.0):
-    - Mantle/extobjc (= 2.2.0)
-  - Mantle/extobjc (2.2.0)
-  - open_file (0.0.1):
-    - Flutter
-  - package_info_plus (0.4.5):
-    - Flutter
-  - path_provider_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - permission_handler_apple (9.0.4):
-    - Flutter
-  - quick_actions_ios (0.0.1):
-    - Flutter
-  - ReachabilitySwift (5.0.0)
-  - SDWebImage (5.13.2):
-    - SDWebImage/Core (= 5.13.2)
-  - SDWebImage/Core (5.13.2)
-  - SDWebImageWebPCoder (0.9.1):
-    - libwebp (~> 1.0)
-    - SDWebImage/Core (~> 5.13)
-  - share_plus (0.0.1):
-    - Flutter
-  - sqflite (0.0.3):
-    - Flutter
-    - FMDB (>= 2.7.5)
-  - SwiftyGif (5.4.3)
-  - uni_links (0.0.1):
-    - Flutter
-  - url_launcher_ios (0.0.1):
-    - Flutter
-  - workmanager (0.0.1):
-    - Flutter
-
-DEPENDENCIES:
-  - app_group_directory (from `.symlinks/plugins/app_group_directory/ios`)
-  - background_fetch (from `.symlinks/plugins/background_fetch/ios`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
-  - DKImagePickerController/PhotoGallery (from `https://github.com/zhangao0086/DKImagePickerController.git`)
-  - file_picker (from `.symlinks/plugins/file_picker/ios`)
-  - Flutter (from `Flutter`)
-  - flutter_custom_tabs (from `.symlinks/plugins/flutter_custom_tabs/ios`)
-  - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`)
-  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
-  - flutter_native_image (from `.symlinks/plugins/flutter_native_image/ios`)
-  - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
-  - home_widget (from `.symlinks/plugins/home_widget/ios`)
-  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
-  - live_activities (from `.symlinks/plugins/live_activities/ios`)
-  - open_file (from `.symlinks/plugins/open_file/ios`)
-  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
-  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - quick_actions_ios (from `.symlinks/plugins/quick_actions_ios/ios`)
-  - share_plus (from `.symlinks/plugins/share_plus/ios`)
-  - sqflite (from `.symlinks/plugins/sqflite/ios`)
-  - uni_links (from `.symlinks/plugins/uni_links/ios`)
-  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - workmanager (from `.symlinks/plugins/workmanager/ios`)
-
-SPEC REPOS:
-  trunk:
-    - DKPhotoGallery
-    - FMDB
-    - libwebp
-    - Mantle
-    - ReachabilitySwift
-    - SDWebImage
-    - SDWebImageWebPCoder
-    - SwiftyGif
-
-EXTERNAL SOURCES:
-  app_group_directory:
-    :path: ".symlinks/plugins/app_group_directory/ios"
-  background_fetch:
-    :path: ".symlinks/plugins/background_fetch/ios"
-  connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/ios"
-  DKImagePickerController:
-    :git: https://github.com/zhangao0086/DKImagePickerController.git
-  file_picker:
-    :path: ".symlinks/plugins/file_picker/ios"
-  Flutter:
-    :path: Flutter
-  flutter_custom_tabs:
-    :path: ".symlinks/plugins/flutter_custom_tabs/ios"
-  flutter_image_compress:
-    :path: ".symlinks/plugins/flutter_image_compress/ios"
-  flutter_local_notifications:
-    :path: ".symlinks/plugins/flutter_local_notifications/ios"
-  flutter_native_image:
-    :path: ".symlinks/plugins/flutter_native_image/ios"
-  flutter_native_splash:
-    :path: ".symlinks/plugins/flutter_native_splash/ios"
-  home_widget:
-    :path: ".symlinks/plugins/home_widget/ios"
-  image_picker_ios:
-    :path: ".symlinks/plugins/image_picker_ios/ios"
-  live_activities:
-    :path: ".symlinks/plugins/live_activities/ios"
-  open_file:
-    :path: ".symlinks/plugins/open_file/ios"
-  package_info_plus:
-    :path: ".symlinks/plugins/package_info_plus/ios"
-  path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/darwin"
-  permission_handler_apple:
-    :path: ".symlinks/plugins/permission_handler_apple/ios"
-  quick_actions_ios:
-    :path: ".symlinks/plugins/quick_actions_ios/ios"
-  share_plus:
-    :path: ".symlinks/plugins/share_plus/ios"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/ios"
-  uni_links:
-    :path: ".symlinks/plugins/uni_links/ios"
-  url_launcher_ios:
-    :path: ".symlinks/plugins/url_launcher_ios/ios"
-  workmanager:
-    :path: ".symlinks/plugins/workmanager/ios"
-
-CHECKOUT OPTIONS:
-  DKImagePickerController:
-    :commit: a727e44718a67e300089174e5591166045815ba4
-    :git: https://github.com/zhangao0086/DKImagePickerController.git
-
-SPEC CHECKSUMS:
-  app_group_directory: 7bf9f8f9819ead554de29da7c25fb7a680d6a9a0
-  background_fetch: bc9b44b0bf8b434e282a2ac9be8662800a0296ed
-  connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
-  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
-  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  flutter_custom_tabs: 7a10a08686955cb748e5d26e0ae586d30689bf89
-  flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
-  flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
-  flutter_native_image: 9c0b7451838484458e5b0fae007b86a4c2d4bdfe
-  flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  home_widget: 2829415127ee92e876f816cbbe44c0b6601b8a37
-  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
-  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
-  live_activities: 9ff56a06a2d43ecd68f56deeed13b18a8304789c
-  Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
-  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
-  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
-  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
-  quick_actions_ios: 9e80dcfadfbc5d47d9cf8f47bcf428b11cf383d4
-  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
-  SDWebImageWebPCoder: 18503de6621dd2c420d680e33d46bf8e1d5169b0
-  share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
-  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
-  SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
-  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
-  workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
-
-PODFILE CHECKSUM: efe5e2e257c61a1c3d5be693ef1a8ea1c4b81d8f
-
-COCOAPODS: 1.12.1

filcnaplo/ios/Runner.xcodeproj/project.pbxproj

@@ -198,9 +198,9 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3127F79F28EAEDE300C2EFB3 /* Build configuration list for PBXNativeTarget "livecard" */;
 			buildPhases = (
+				3127F78A28EAEDE200C2EFB3 /* Resources */,
 				3127F78828EAEDE200C2EFB3 /* Sources */,
 				3127F78928EAEDE200C2EFB3 /* Frameworks */,
-				3127F78A28EAEDE200C2EFB3 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -299,7 +299,7 @@
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
+			buildActionMask = 12;
 			files = (
 			);
 			inputPaths = (
@@ -310,11 +310,11 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
 		};
 		71459C0EB905E05018E3D78F /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
+			buildActionMask = 12;
 			files = (
 			);
 			inputFileListPaths = (
@@ -364,7 +364,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

filcnaplo/ios/Runner/Runner.entitlements

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>aps-environment</key>
+	<string>development</string>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.refilcnaplo.livecard</string>

filcnaplo/ios/livecard/lesson_model.swift

@@ -1,6 +1,7 @@
 import Foundation
 
 class LessonData {
+  var color: String
   var icon: String
   var index: String
   var title: String
@@ -15,6 +16,7 @@ class LessonData {
   init?() {
     let sharedDefault = UserDefaults(suiteName: "group.refilc.livecard")!
       
+    self.color = sharedDefault.string(forKey: "color")!
     self.icon = sharedDefault.string(forKey: "icon")!
     self.index = sharedDefault.string(forKey: "index")!
     self.title = sharedDefault.string(forKey: "title")!

filcnaplo/ios/livecard/livecard.entitlements

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>aps-environment</key>
+	<string>development</string>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.refilcnaplo.livecard</string>

filcnaplo/ios/livecard/livecard.swift

@@ -11,6 +11,33 @@ struct Widgets: WidgetBundle {
   }
 }
 
+// Color Converter
+extension Color {
+    init(hex: String, alpha: Double = 1.0) {
+        var hexValue = hex.trimmingCharacters(in: .whitespacesAndNewlines).uppercased()
+
+        if hexValue.hasPrefix("#") {
+            hexValue.remove(at: hexValue.startIndex)
+        }
+
+        var rgbValue: UInt64 = 0
+        Scanner(string: hexValue).scanHexInt64(&rgbValue)
+
+        let red = Double((rgbValue & 0xFF0000) >> 16) / 255.0
+        let green = Double((rgbValue & 0x00FF00) >> 8) / 255.0
+        let blue = Double(rgbValue & 0x0000FF) / 255.0
+
+        self.init(
+            .sRGB,
+            red: red,
+            green: green,
+            blue: blue,
+            opacity: alpha
+        )
+    }
+}
+
+
 // We need to redefined live activities pipe
 struct LiveActivitiesAppAttributes: ActivityAttributes, Identifiable {
   public struct ContentState: Codable, Hashable { }
@@ -68,6 +95,11 @@ struct LockScreenLiveActivityView: View {
           .monospacedDigit()
           .padding(.trailing, CGFloat(24))
     }
+    .activityBackgroundTint(
+        lesson!.color == "#676767"
+        ? nil
+        : Color(hex: lesson!.color)
+    )
   }
 }
 
@@ -144,7 +176,11 @@ struct LiveCardWidget: Widget {
             .font(.system(size: CGFloat(10)))
         }
       }
-      .keylineTint(.accentColor)
+      .keylineTint(
+        lesson!.color == "#676767"
+        ? nil
+        : Color(hex: lesson!.color)
+      )
     }
   }
 }

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 news = "https://api.refilc.hu/v1/public/news";
-  static const supporters = "https://api.refilc.hu/v1/public/supporters";
+  static const schoolList = "$baseUrl/v1/public/school-list";
+  static const news = "$baseUrl/v1/public/news";
+  static const supporters = "$baseUrl/v1/public/supporters";
 
   // Private API
-  static const config = "https://api.refilc.hu/v1/private/config";
-  static const reportApi = "https://api.refilc.hu/v1/private/crash-report";
+  static const ads = "$baseUrl/v1/private/ads";
+  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,12 @@ 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 Future<bool> checkConnectivity() async =>
       (await Connectivity().checkConnectivity()) != ConnectivityResult.none;
 
@@ -117,6 +130,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));
@@ -163,6 +194,46 @@ 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();
+
+      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.addSharedTheme: $error $stacktrace");
+    }
+    return null;
+  }
 }
 
 class ErrorReport {

filcnaplo/lib/api/login.dart

@@ -27,7 +27,7 @@ enum LoginState {
   failed,
   normal,
   inProgress,
-  success
+  success,
 }
 
 Nonce getNonce(String nonce, String username, String instituteCode) {
@@ -39,7 +39,7 @@ Nonce getNonce(String nonce, String username, String instituteCode) {
   return nonceEncoder;
 }
 
-Future loginApi({
+Future loginAPI({
   required String username,
   required String password,
   required String instituteCode,
@@ -121,7 +121,7 @@ Future loginApi({
 
           return LoginState.success;
         } catch (error) {
-          print("ERROR: loginApi: $error");
+          print("ERROR: loginAPI: $error");
           // maybe check debug mode
           // ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("ERROR: $error")));
           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

@@ -47,7 +47,7 @@ class LiveCardProvider extends ChangeNotifier {
     required SettingsProvider settings,
   })  : _timetable = timetable,
         _settings = settings {
-    // Check if live card is enabled .areActivitiesEnabled()
+    if (Platform.isIOS) {
       _liveActivitiesPlugin.areActivitiesEnabled().then((value) {
         // Console log
         if (kDebugMode) {
@@ -69,6 +69,7 @@ class LiveCardProvider extends ChangeNotifier {
           : Duration.zero;
       update();
     }
+  }
 
   @override
   void dispose() {
@@ -87,6 +88,7 @@ class LiveCardProvider extends ChangeNotifier {
 
   // Debugging
   static DateTime _now() {
+    // return DateTime(2023, 8, 31, 8, 0);
     return DateTime.now();
   }
 
@@ -110,6 +112,8 @@ class LiveCardProvider extends ChangeNotifier {
     switch (currentState) {
       case LiveCardState.duringLesson:
         return {
+          "color":
+              '#${_settings.liveActivityColor.toString().substring(10, 16)}',
           "icon": currentLesson != null
               ? SubjectIcon.resolveName(subject: currentLesson?.subject)
               : "book",
@@ -142,6 +146,8 @@ class LiveCardProvider extends ChangeNotifier {
         final diff = getFloorDifference();
 
         return {
+          "color":
+              '#${_settings.liveActivityColor.toString().substring(10, 16)}',
           "icon": iconFloorMap[diff] ?? "cup.and.saucer",
           "title": "Szünet",
           "description": "go $diff".i18n.fill([

filcnaplo/lib/api/providers/news_provider.dart

@@ -1,7 +1,4 @@
 // ignore_for_file: use_build_context_synchronously
-
-import 'dart:math';
-
 import 'package:filcnaplo/api/client.dart';
 import 'package:filcnaplo/models/news.dart';
 import 'package:filcnaplo/models/settings.dart';
@@ -11,7 +8,7 @@ import 'package:provider/provider.dart';
 class NewsProvider extends ChangeNotifier {
   // Private
   late List<News> _news;
-  late int _state;
+  //late int _state;
   late int _fresh;
   bool show = false;
   late BuildContext _context;
@@ -30,56 +27,83 @@ class NewsProvider extends ChangeNotifier {
 
   Future<void> restore() async {
     // Load news state from the database
-    var state_ = Provider.of<SettingsProvider>(_context, listen: false).newsState;
+    var seen_ = Provider.of<SettingsProvider>(_context, listen: false).seenNews;
 
-    if (state_ == -1) {
+    if (seen_.isEmpty) {
       var news_ = await FilcAPI.getNews();
       if (news_ != null) {
-        state_ = news_.length;
         _news = news_;
+        show = true;
       }
     }
 
-    _state = state_;
-    Provider.of<SettingsProvider>(_context, listen: false).update(newsState: _state);
+    //_state = seen_;
+    // Provider.of<SettingsProvider>(_context, listen: false)
+    //     .update(seenNewsId: news_.id);
   }
 
   Future<void> fetch() async {
     var news_ = await FilcAPI.getNews();
     if (news_ == null) return;
 
+    show = false;
+
     _news = news_;
-    _fresh = news_.length - _state;
 
-    if (_fresh < 0) {
-      _state = news_.length;
-      Provider.of<SettingsProvider>(_context, listen: false).update(newsState: _state);
-    }
-
-    _fresh = max(_fresh, 0);
-
-    if (_fresh > 0) {
+    for (var news in news_) {
+      if (news.expireDate.isAfter(DateTime.now()) &&
+          Provider.of<SettingsProvider>(_context, listen: false)
+                  .seenNews
+                  .contains(news.id) ==
+              false) {
         show = true;
+        Provider.of<SettingsProvider>(_context, listen: false)
+            .update(seenNewsId: news.id);
+
         notifyListeners();
       }
     }
+    // print(news_.length);
+    // print(_state);
+
+    // _news = news_;
+    // _fresh = news_.length - _state;
+
+    // if (_fresh < 0) {
+    //   _state = news_.length;
+    //   Provider.of<SettingsProvider>(_context, listen: false)
+    //       .update(newsState: _state);
+    // }
+
+    // _fresh = max(_fresh, 0);
+
+    // if (_fresh > 0) {
+    //   show = true;
+    //   notifyListeners();
+    // }
+
+    // print(_fresh);
+    // print(_state);
+    // print(show);
+  }
 
   void lock() => show = false;
 
   void release() {
-    if (_fresh == 0) return;
+    // if (_fresh == 0) return;
 
-    _fresh--;
-    _state++;
+    // _fresh--;
+    // //_state++;
 
-    Provider.of<SettingsProvider>(_context, listen: false).update(newsState: _state);
+    // // Provider.of<SettingsProvider>(_context, listen: false)
+    // //     .update(seenNewsId: _state);
 
-    if (_fresh > 0) {
-      show = true;
-    } else {
-      show = false;
-    }
+    // if (_fresh > 0) {
+    //   show = true;
+    // } else {
+    //   show = false;
+    // }
 
-    notifyListeners();
+    // notifyListeners();
   }
 }

filcnaplo/lib/api/providers/status_provider.dart

@@ -2,7 +2,7 @@ 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 = [];
@@ -37,7 +37,8 @@ class StatusProvider extends ChangeNotifier {
   }
 
   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 +49,21 @@ class StatusProvider extends ChangeNotifier {
         notifyListeners();
       }
     }
+
+    if (res.body == "invalid_grant" ||
+        res.body.replaceAll(' ', '') == '' ||
+        res.statusCode == 400) {
+      if (!_stack.contains(Status.apiError)) {
+        _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/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';
@@ -12,7 +13,10 @@ import 'package:filcnaplo/theme/observer.dart';
 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';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:i18n_extension/i18n_widget.dart';
@@ -88,6 +92,7 @@ class App extends StatelessWidget {
 
     return MultiProvider(
       providers: [
+        // refilc providers
         ChangeNotifierProvider<PremiumProvider>(create: (_) => premium),
         ChangeNotifierProvider<SettingsProvider>(create: (_) => settings),
         ChangeNotifierProvider<UserProvider>(create: (_) => user),
@@ -95,43 +100,78 @@ class App extends StatelessWidget {
         Provider<KretaClient>(create: (_) => kreta),
         Provider<DatabaseProvider>(create: (context) => database),
         ChangeNotifierProvider<ThemeModeObserver>(
-            create: (context) =>
-                ThemeModeObserver(initialTheme: settings.theme)),
+          create: (context) => ThemeModeObserver(
+            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 providers
+        // user data (kreten) providers
         ChangeNotifierProvider<GradeProvider>(
           create: (_) => GradeProvider(
             settings: settings,
             user: user,
             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) => HomeworkProvider(context: context)),
+          create: (context) => HomeworkProvider(
+            context: context,
+            database: database,
+          ),
+        ),
         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(
             settings: settings,
             user: user,
             database: database,
-                kreta: kreta)),
+            kreta: kreta,
+          ),
+        ),
         ChangeNotifierProvider<LiveCardProvider>(
-            create: (context) =>
-                LiveCardProvider(timetable: timetable, settings: settings))
+          create: (context) => LiveCardProvider(
+            timetable: timetable,
+            settings: settings,
+          ),
+        ),
+        ChangeNotifierProvider<GoalProvider>(
+          create: (context) => GoalProvider(
+            database: database,
+            user: user,
+          ),
+        ),
+        ChangeNotifierProvider<ShareProvider>(
+          create: (context) => ShareProvider(
+            user: user,
+          ),
+        ),
       ],
       child: Consumer<ThemeModeObserver>(
         builder: (context, themeMode, child) {
@@ -194,8 +234,19 @@ class App extends StatelessWidget {
   }
 
   Route? rootNavigator(RouteSettings route) {
-    // if platform == android || platform == ios
-    if (Platform.isAndroid || Platform.isIOS) {
+    if (kIsWeb) {
+      switch (route.name) {
+        case "login_back":
+          return CupertinoPageRoute(
+              builder: (context) => const desktop.LoginScreen(back: true));
+        case "login":
+          return _rootRoute(const desktop.LoginScreen());
+        case "navigation":
+          return _rootRoute(const desktop.NavigationScreen());
+        case "login_to_navigation":
+          return desktop.loginRoute(const desktop.NavigationScreen());
+      }
+    } else if (Platform.isAndroid || Platform.isIOS) {
       switch (route.name) {
         case "login_back":
           return CupertinoPageRoute(

filcnaplo/lib/database/init.dart

@@ -5,25 +5,34 @@ import 'dart:io';
 import 'package:filcnaplo/api/providers/database_provider.dart';
 import 'package:filcnaplo/database/struct.dart';
 import 'package:filcnaplo/models/settings.dart';
+import 'package:flutter/foundation.dart';
 // ignore: depend_on_referenced_packages
 import 'package:sqflite_common_ffi/sqflite_ffi.dart';
+import 'package:sqflite_common_ffi_web/sqflite_ffi_web.dart';
 
 const settingsDB = DatabaseStruct("settings", {
   "language": String, "start_page": int, "rounding": int, "theme": int,
-  "accent_color": int, "news": int, "news_state": int, "developer_mode": int,
+  "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
   "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,
   "notifications": int, "notifications_bitfield": int,
-  "notification_poll_interval": int, // notifications
+  "notification_poll_interval": int,
+  "notifications_grades": int,
+  "notifications_absences": int,
+  "notifications_messages": int,
+  "notifications_lessons": int, // notifications
   "x_filc_id": String, "graph_class_avg": int, "presentation_mode": int,
   "bell_delay": int, "bell_delay_enabled": int,
   "grade_opening_fun": int, "icon_pack": String, "premium_scopes": String,
   "premium_token": String, "premium_login": String,
   "last_account_id": String, "renamed_subjects_enabled": int,
-  "renamed_subjects_italics": int,
+  "renamed_subjects_italics": int, "renamed_teachers_enabled": int,
+  "renamed_teachers_italics": int,
+  "live_activity_color": String,
 });
 // DON'T FORGET TO UPDATE DEFAULT VALUES IN `initDB` MIGRATION OR ELSE PARENTS WILL COMPLAIN ABOUT THEIR CHILDREN MISSING
 // YOU'VE BEEN WARNED!!!
@@ -38,8 +47,15 @@ const userDataDB = DatabaseStruct("user_data", {
   "events": String, "absences": String, "group_averages": String,
   // renamed subjects // non kreta data
   "renamed_subjects": String,
+  // renamed teachers // non kreta data
+  "renamed_teachers": String,
   // "subject_lesson_count": String, // non kreta data
   "last_seen_grade": int,
+  // goal planning // non kreta data
+  "goal_plans": String,
+  "goal_averages": String,
+  "goal_befores": String,
+  "goal_pin_dates": String,
 });
 
 Future<void> createTable(Database db, DatabaseStruct struct) =>
@@ -48,7 +64,9 @@ Future<void> createTable(Database db, DatabaseStruct struct) =>
 Future<Database> initDB(DatabaseProvider database) async {
   Database db;
 
-  if (Platform.isLinux || Platform.isWindows) {
+  if (kIsWeb) {
+    db = await databaseFactoryFfiWeb.openDatabase("app.db");
+  } else if (Platform.isLinux || Platform.isWindows) {
     sqfliteFfiInit();
     db = await databaseFactoryFfi.openDatabase("app.db");
   } else {
@@ -85,8 +103,15 @@ Future<Database> initDB(DatabaseProvider database) async {
       "group_averages": "[]",
       // renamed subjects // non kreta data
       "renamed_subjects": "{}",
+      // renamed teachers // non kreta data
+      "renamed_teachers": "{}",
       // "subject_lesson_count": "{}", // non kreta data
       "last_seen_grade": 0,
+      // goal planning // non kreta data
+      "goal_plans": "{}",
+      "goal_averages": "{}",
+      "goal_befores": "{}",
+      "goal_pin_dates": "{}",
     });
   } catch (error) {
     print("ERROR: migrateDB: $error");

filcnaplo/lib/database/query.dart

@@ -26,7 +26,8 @@ class DatabaseQuery {
 
   Future<SettingsProvider> getSettings(DatabaseProvider database) async {
     Map settingsMap = (await db.query("settings")).elementAt(0);
-    SettingsProvider settings = SettingsProvider.fromMap(settingsMap, database: database);
+    SettingsProvider settings =
+        SettingsProvider.fromMap(settingsMap, database: database);
     return settings;
   }
 
@@ -36,7 +37,10 @@ class DatabaseQuery {
     for (var user in usersMap) {
       userProvider.addUser(User.fromMap(user));
     }
-    if (userProvider.getUsers().map((e) => e.id).contains(settings.lastAccountId)) {
+    if (userProvider
+        .getUsers()
+        .map((e) => e.id)
+        .contains(settings.lastAccountId)) {
       userProvider.setUser(settings.lastAccountId);
     } else {
       if (usersMap.isNotEmpty) {
@@ -54,100 +58,133 @@ class UserDatabaseQuery {
   final Database db;
 
   Future<List<Grade>> getGrades({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return [];
     String? gradesJson = userData.elementAt(0)["grades"] as String?;
     if (gradesJson == null) return [];
-    List<Grade> grades = (jsonDecode(gradesJson) as List).map((e) => Grade.fromJson(e)).toList();
+    List<Grade> grades =
+        (jsonDecode(gradesJson) as List).map((e) => Grade.fromJson(e)).toList();
     return grades;
   }
 
   Future<Map<Week, List<Lesson>>> getLessons({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return {};
     String? lessonsJson = userData.elementAt(0)["timetable"] as String?;
     if (lessonsJson == null) return {};
     if (jsonDecode(lessonsJson) is List) return {};
-    Map<Week, List<Lesson>> lessons = (jsonDecode(lessonsJson) as Map).cast<String, List>().map((key, value) {
-      return MapEntry(Week.fromId(int.parse(key)), value.cast<Map<String, Object?>>().map((e) => Lesson.fromJson(e)).toList());
+    Map<Week, List<Lesson>> lessons =
+        (jsonDecode(lessonsJson) as Map).cast<String, List>().map((key, value) {
+      return MapEntry(
+          Week.fromId(int.parse(key)),
+          value
+              .cast<Map<String, Object?>>()
+              .map((e) => Lesson.fromJson(e))
+              .toList());
     }).cast();
     return lessons;
   }
 
   Future<List<Exam>> getExams({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return [];
     String? examsJson = userData.elementAt(0)["exams"] as String?;
     if (examsJson == null) return [];
-    List<Exam> exams = (jsonDecode(examsJson) as List).map((e) => Exam.fromJson(e)).toList();
+    List<Exam> exams =
+        (jsonDecode(examsJson) as List).map((e) => Exam.fromJson(e)).toList();
     return exams;
   }
 
   Future<List<Homework>> getHomework({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return [];
     String? homeworkJson = userData.elementAt(0)["homework"] as String?;
     if (homeworkJson == null) return [];
-    List<Homework> homework = (jsonDecode(homeworkJson) as List).map((e) => Homework.fromJson(e)).toList();
+    List<Homework> homework = (jsonDecode(homeworkJson) as List)
+        .map((e) => Homework.fromJson(e))
+        .toList();
     return homework;
   }
 
   Future<List<Message>> getMessages({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return [];
     String? messagesJson = userData.elementAt(0)["messages"] as String?;
     if (messagesJson == null) return [];
-    List<Message> messages = (jsonDecode(messagesJson) as List).map((e) => Message.fromJson(e)).toList();
+    List<Message> messages = (jsonDecode(messagesJson) as List)
+        .map((e) => Message.fromJson(e))
+        .toList();
     return messages;
   }
 
   Future<List<Note>> getNotes({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return [];
     String? notesJson = userData.elementAt(0)["notes"] as String?;
     if (notesJson == null) return [];
-    List<Note> notes = (jsonDecode(notesJson) as List).map((e) => Note.fromJson(e)).toList();
+    List<Note> notes =
+        (jsonDecode(notesJson) as List).map((e) => Note.fromJson(e)).toList();
     return notes;
   }
 
   Future<List<Event>> getEvents({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return [];
     String? eventsJson = userData.elementAt(0)["events"] as String?;
     if (eventsJson == null) return [];
-    List<Event> events = (jsonDecode(eventsJson) as List).map((e) => Event.fromJson(e)).toList();
+    List<Event> events =
+        (jsonDecode(eventsJson) as List).map((e) => Event.fromJson(e)).toList();
     return events;
   }
 
   Future<List<Absence>> getAbsences({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return [];
     String? absencesJson = userData.elementAt(0)["absences"] as String?;
     if (absencesJson == null) return [];
-    List<Absence> absences = (jsonDecode(absencesJson) as List).map((e) => Absence.fromJson(e)).toList();
+    List<Absence> absences = (jsonDecode(absencesJson) as List)
+        .map((e) => Absence.fromJson(e))
+        .toList();
     return absences;
   }
 
   Future<List<GroupAverage>> getGroupAverages({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return [];
-    String? groupAveragesJson = userData.elementAt(0)["group_averages"] as String?;
+    String? groupAveragesJson =
+        userData.elementAt(0)["group_averages"] as String?;
     if (groupAveragesJson == null) return [];
-    List<GroupAverage> groupAverages = (jsonDecode(groupAveragesJson) as List).map((e) => GroupAverage.fromJson(e)).toList();
+    List<GroupAverage> groupAverages = (jsonDecode(groupAveragesJson) as List)
+        .map((e) => GroupAverage.fromJson(e))
+        .toList();
     return groupAverages;
   }
 
-  Future<SubjectLessonCount> getSubjectLessonCount({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+  Future<SubjectLessonCount> getSubjectLessonCount(
+      {required String userId}) async {
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return SubjectLessonCount.fromMap({});
-    String? lessonCountJson = userData.elementAt(0)["subject_lesson_count"] as String?;
+    String? lessonCountJson =
+        userData.elementAt(0)["subject_lesson_count"] as String?;
     if (lessonCountJson == null) return SubjectLessonCount.fromMap({});
-    SubjectLessonCount lessonCount = SubjectLessonCount.fromMap(jsonDecode(lessonCountJson) as Map);
+    SubjectLessonCount lessonCount =
+        SubjectLessonCount.fromMap(jsonDecode(lessonCountJson) as Map);
     return lessonCount;
   }
 
   Future<DateTime> lastSeenGrade({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return DateTime(0);
     int? lastSeenDate = userData.elementAt(0)["last_seen_grade"] as int?;
     if (lastSeenDate == null) return DateTime(0);
@@ -155,11 +192,71 @@ class UserDatabaseQuery {
     return lastSeen;
   }
 
+  // renamed things
   Future<Map<String, String>> renamedSubjects({required String userId}) async {
-    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return {};
-    String? renamedSubjectsJson = userData.elementAt(0)["renamed_subjects"] as String?;
+    String? renamedSubjectsJson =
+        userData.elementAt(0)["renamed_subjects"] as String?;
     if (renamedSubjectsJson == null) return {};
-    return (jsonDecode(renamedSubjectsJson) as Map).map((key, value) => MapEntry(key.toString(), value.toString()));
+    return (jsonDecode(renamedSubjectsJson) as Map)
+        .map((key, value) => MapEntry(key.toString(), value.toString()));
+  }
+
+  Future<Map<String, String>> renamedTeachers({required String userId}) async {
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    if (userData.isEmpty) return {};
+    String? renamedTeachersJson =
+        userData.elementAt(0)["renamed_teachers"] as String?;
+    if (renamedTeachersJson == null) return {};
+    return (jsonDecode(renamedTeachersJson) as Map)
+        .map((key, value) => MapEntry(key.toString(), value.toString()));
+  }
+
+  // goal planner
+  Future<Map<String, String>> subjectGoalPlans({required String userId}) async {
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    if (userData.isEmpty) return {};
+    String? goalPlansJson = userData.elementAt(0)["goal_plans"] as String?;
+    if (goalPlansJson == null) return {};
+    return (jsonDecode(goalPlansJson) as Map)
+        .map((key, value) => MapEntry(key.toString(), value.toString()));
+  }
+
+  Future<Map<String, String>> subjectGoalAverages(
+      {required String userId}) async {
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    if (userData.isEmpty) return {};
+    String? goalAvgsJson = userData.elementAt(0)["goal_averages"] as String?;
+    if (goalAvgsJson == null) return {};
+    return (jsonDecode(goalAvgsJson) as Map)
+        .map((key, value) => MapEntry(key.toString(), value.toString()));
+  }
+
+  Future<Map<String, String>> subjectGoalBefores(
+      {required String userId}) async {
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    if (userData.isEmpty) return {};
+    String? goalBeforesJson = userData.elementAt(0)["goal_befores"] as String?;
+    if (goalBeforesJson == null) return {};
+    return (jsonDecode(goalBeforesJson) as Map)
+        .map((key, value) => MapEntry(key.toString(), value.toString()));
+  }
+
+  Future<Map<String, String>> subjectGoalPinDates(
+      {required String userId}) async {
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    if (userData.isEmpty) return {};
+    String? goalPinDatesJson =
+        userData.elementAt(0)["goal_pin_dates"] as String?;
+    if (goalPinDatesJson == null) return {};
+    return (jsonDecode(goalPinDatesJson) as Map)
+        .map((key, value) => MapEntry(key.toString(), value.toString()));
   }
 }

filcnaplo/lib/database/store.dart

@@ -27,9 +27,11 @@ class DatabaseStore {
   }
 
   Future<void> storeUser(User user) async {
-    List userRes = await db.query("users", where: "id = ?", whereArgs: [user.id]);
+    List userRes =
+        await db.query("users", where: "id = ?", whereArgs: [user.id]);
     if (userRes.isNotEmpty) {
-      await db.update("users", user.toMap(), where: "id = ?", whereArgs: [user.id]);
+      await db
+          .update("users", user.toMap(), where: "id = ?", whereArgs: [user.id]);
     } else {
       await db.insert("users", user.toMap());
       await db.insert("user_data", {"id": user.id});
@@ -49,64 +51,123 @@ class UserDatabaseStore {
 
   Future<void> storeGrades(List<Grade> grades, {required String userId}) async {
     String gradesJson = jsonEncode(grades.map((e) => e.json).toList());
-    await db.update("user_data", {"grades": gradesJson}, where: "id = ?", whereArgs: [userId]);
+    await db.update("user_data", {"grades": gradesJson},
+        where: "id = ?", whereArgs: [userId]);
   }
 
-  Future<void> storeLessons(Map<Week, List<Lesson>?> lessons, {required String userId}) async {
+  Future<void> storeLessons(Map<Week, List<Lesson>?> lessons,
+      {required String userId}) async {
     final map = lessons.map<String, List<Map<String, Object?>>>(
-      (k, v) => MapEntry(k.id.toString(), v!.where((e) => e.json != null).map((e) => e.json!).toList().cast()),
+      (k, v) => MapEntry(k.id.toString(),
+          v!.where((e) => e.json != null).map((e) => e.json!).toList().cast()),
     );
     String lessonsJson = jsonEncode(map);
-    await db.update("user_data", {"timetable": lessonsJson}, where: "id = ?", whereArgs: [userId]);
+    await db.update("user_data", {"timetable": lessonsJson},
+        where: "id = ?", whereArgs: [userId]);
   }
 
   Future<void> storeExams(List<Exam> exams, {required String userId}) async {
     String examsJson = jsonEncode(exams.map((e) => e.json).toList());
-    await db.update("user_data", {"exams": examsJson}, where: "id = ?", whereArgs: [userId]);
+    await db.update("user_data", {"exams": examsJson},
+        where: "id = ?", whereArgs: [userId]);
   }
 
-  Future<void> storeHomework(List<Homework> homework, {required String userId}) async {
+  Future<void> storeHomework(List<Homework> homework,
+      {required String userId}) async {
     String homeworkJson = jsonEncode(homework.map((e) => e.json).toList());
-    await db.update("user_data", {"homework": homeworkJson}, where: "id = ?", whereArgs: [userId]);
+    await db.update("user_data", {"homework": homeworkJson},
+        where: "id = ?", whereArgs: [userId]);
   }
 
-  Future<void> storeMessages(List<Message> messages, {required String userId}) async {
+  Future<void> storeMessages(List<Message> messages,
+      {required String userId}) async {
     String messagesJson = jsonEncode(messages.map((e) => e.json).toList());
-    await db.update("user_data", {"messages": messagesJson}, where: "id = ?", whereArgs: [userId]);
+    await db.update("user_data", {"messages": messagesJson},
+        where: "id = ?", whereArgs: [userId]);
   }
 
   Future<void> storeNotes(List<Note> notes, {required String userId}) async {
     String notesJson = jsonEncode(notes.map((e) => e.json).toList());
-    await db.update("user_data", {"notes": notesJson}, where: "id = ?", whereArgs: [userId]);
+    await db.update("user_data", {"notes": notesJson},
+        where: "id = ?", whereArgs: [userId]);
   }
 
   Future<void> storeEvents(List<Event> events, {required String userId}) async {
     String eventsJson = jsonEncode(events.map((e) => e.json).toList());
-    await db.update("user_data", {"events": eventsJson}, where: "id = ?", whereArgs: [userId]);
+    await db.update("user_data", {"events": eventsJson},
+        where: "id = ?", whereArgs: [userId]);
   }
 
-  Future<void> storeAbsences(List<Absence> absences, {required String userId}) async {
+  Future<void> storeAbsences(List<Absence> absences,
+      {required String userId}) async {
     String absencesJson = jsonEncode(absences.map((e) => e.json).toList());
-    await db.update("user_data", {"absences": absencesJson}, where: "id = ?", whereArgs: [userId]);
+    await db.update("user_data", {"absences": absencesJson},
+        where: "id = ?", whereArgs: [userId]);
   }
 
-  Future<void> storeGroupAverages(List<GroupAverage> groupAverages, {required String userId}) async {
-    String groupAveragesJson = jsonEncode(groupAverages.map((e) => e.json).toList());
-    await db.update("user_data", {"group_averages": groupAveragesJson}, where: "id = ?", whereArgs: [userId]);
+  Future<void> storeGroupAverages(List<GroupAverage> groupAverages,
+      {required String userId}) async {
+    String groupAveragesJson =
+        jsonEncode(groupAverages.map((e) => e.json).toList());
+    await db.update("user_data", {"group_averages": groupAveragesJson},
+        where: "id = ?", whereArgs: [userId]);
   }
 
-  Future<void> storeSubjectLessonCount(SubjectLessonCount lessonCount, {required String userId}) async {
+  Future<void> storeSubjectLessonCount(SubjectLessonCount lessonCount,
+      {required String userId}) async {
     String lessonCountJson = jsonEncode(lessonCount.toMap());
-    await db.update("user_data", {"subject_lesson_count": lessonCountJson}, where: "id = ?", whereArgs: [userId]);
+    await db.update("user_data", {"subject_lesson_count": lessonCountJson},
+        where: "id = ?", whereArgs: [userId]);
   }
 
-  Future<void> storeLastSeenGrade(DateTime date, {required String userId}) async {
+  Future<void> storeLastSeenGrade(DateTime date,
+      {required String userId}) async {
     int lastSeenDate = date.millisecondsSinceEpoch;
-    await db.update("user_data", {"last_seen_grade": lastSeenDate}, where: "id = ?", whereArgs: [userId]);
+    await db.update("user_data", {"last_seen_grade": lastSeenDate},
+        where: "id = ?", whereArgs: [userId]);
   }
 
-  Future<void> storeRenamedSubjects(Map<String, String> subjects, {required String userId}) async {
+  // renamed things
+  Future<void> storeRenamedSubjects(Map<String, String> subjects,
+      {required String userId}) async {
     String renamedSubjectsJson = jsonEncode(subjects);
-    await db.update("user_data", {"renamed_subjects": renamedSubjectsJson}, where: "id = ?", whereArgs: [userId]);
+    await db.update("user_data", {"renamed_subjects": renamedSubjectsJson},
+        where: "id = ?", whereArgs: [userId]);
+  }
+
+  Future<void> storeRenamedTeachers(Map<String, String> teachers,
+      {required String userId}) async {
+    String renamedTeachersJson = jsonEncode(teachers);
+    await db.update("user_data", {"renamed_teachers": renamedTeachersJson},
+        where: "id = ?", whereArgs: [userId]);
+  }
+
+  // goal planner
+  Future<void> storeSubjectGoalPlans(Map<String, String> plans,
+      {required String userId}) async {
+    String goalPlansJson = jsonEncode(plans);
+    await db.update("user_data", {"goal_plans": goalPlansJson},
+        where: "id = ?", whereArgs: [userId]);
+  }
+
+  Future<void> storeSubjectGoalAverages(Map<String, String> avgs,
+      {required String userId}) async {
+    String goalAvgsJson = jsonEncode(avgs);
+    await db.update("user_data", {"goal_averages": goalAvgsJson},
+        where: "id = ?", whereArgs: [userId]);
+  }
+
+  Future<void> storeSubjectGoalBefores(Map<String, String> befores,
+      {required String userId}) async {
+    String goalBeforesJson = jsonEncode(befores);
+    await db.update("user_data", {"goal_befores": goalBeforesJson},
+        where: "id = ?", whereArgs: [userId]);
+  }
+
+  Future<void> storeSubjectGoalPinDates(Map<String, String> dates,
+      {required String userId}) async {
+    String goalPinDatesJson = jsonEncode(dates);
+    await db.update("user_data", {"goal_pin_dates": goalPinDatesJson},
+        where: "id = ?", whereArgs: [userId]);
   }
 }

filcnaplo/lib/helpers/notification_helper.dart

@@ -1,34 +1,88 @@
-import 'dart:math';
-import 'dart:ui';
-
 import 'package:filcnaplo/api/providers/database_provider.dart';
 import 'package:filcnaplo/api/providers/status_provider.dart';
 import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/helpers/notification_helper.i18n.dart';
+import 'package:filcnaplo_kreta_api/client/api.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
+import 'package:filcnaplo_kreta_api/models/absence.dart';
 import 'package:filcnaplo_kreta_api/models/grade.dart';
+import 'package:filcnaplo_kreta_api/models/lesson.dart';
+import 'package:filcnaplo_kreta_api/models/week.dart';
 import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:filcnaplo_kreta_api/providers/timetable_provider.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart'
+    hide Message;
+import 'package:i18n_extension/i18n_widget.dart';
+import 'package:intl/intl.dart';
+import 'package:filcnaplo_kreta_api/models/message.dart';
 
 class NotificationsHelper {
+  late DatabaseProvider database;
+  late SettingsProvider settingsProvider;
+  late UserProvider userProvider;
+  late KretaClient kretaClient;
+  FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
+      FlutterLocalNotificationsPlugin();
+
+  List<T> combineLists<T, K>(
+    List<T> list1,
+    List<T> list2,
+    K Function(T) keyExtractor,
+  ) {
+    Set<K> uniqueKeys = <K>{};
+    List<T> combinedList = [];
+
+    for (T item in list1) {
+      K key = keyExtractor(item);
+      if (!uniqueKeys.contains(key)) {
+        uniqueKeys.add(key);
+        combinedList.add(item);
+      }
+    }
+
+    for (T item in list2) {
+      K key = keyExtractor(item);
+      if (!uniqueKeys.contains(key)) {
+        uniqueKeys.add(key);
+        combinedList.add(item);
+      }
+    }
+
+    return combinedList;
+  }
+
+  String dayTitle(DateTime date) {
+    try {
+      return DateFormat("EEEE", I18n.locale.languageCode).format(date);
+    } catch (e) {
+      return "Unknown";
+    }
+  }
+
   @pragma('vm:entry-point')
   void backgroundJob() async {
     // initialize providers
-    FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
-        FlutterLocalNotificationsPlugin();
-    DatabaseProvider database = DatabaseProvider();
+    database = DatabaseProvider();
     await database.init();
-    SettingsProvider settingsProvider =
-        await database.query.getSettings(database);
-    UserProvider userProvider = await database.query.getUsers(settingsProvider);
+    settingsProvider = await database.query.getSettings(database);
+    userProvider = await database.query.getUsers(settingsProvider);
 
     if (userProvider.id != null && settingsProvider.notificationsEnabled) {
-      // refresh grades
+      // refresh kreta login
       final status = StatusProvider();
-      final kretaClient = KretaClient(
+      kretaClient = KretaClient(
           user: userProvider, settings: settingsProvider, status: status);
       kretaClient.refreshLogin();
+      if (settingsProvider.notificationsGradesEnabled) gradeNotification();
+      if (settingsProvider.notificationsAbsencesEnabled) absenceNotification();
+      if (settingsProvider.notificationsMessagesEnabled) messageNotification();
+      if (settingsProvider.notificationsLessonsEnabled) lessonNotification();
+    }
+  }
+
+  void gradeNotification() async {
+    // fetch grades
     GradeProvider gradeProvider = GradeProvider(
         settings: settingsProvider,
         user: userProvider,
@@ -42,35 +96,506 @@ class NotificationsHelper {
 
     // loop through grades and see which hasn't been seen yet
     for (Grade grade in grades) {
+      // if grade is not a normal grade (1-5), don't show it
+      if ([1, 2, 3, 4, 5].contains(grade.value.value)) {
         // if the grade was added over a week ago, don't show it to avoid notification spam
         if (grade.seenDate.isAfter(lastSeenGrade) &&
             grade.date.difference(DateTime.now()).inDays * -1 < 7) {
           // send notificiation about new grade
-          const AndroidNotificationDetails androidNotificationDetails =
-              AndroidNotificationDetails('GRADES', 'Jegyek',
+          AndroidNotificationDetails androidNotificationDetails =
+              AndroidNotificationDetails(
+            'GRADES',
+            'Jegyek',
             channelDescription: 'Értesítés jegyek beírásakor',
             importance: Importance.max,
             priority: Priority.max,
-                  color: Color(0xFF3D7BF4),
-                  ticker: 'Jegyek');
-          const NotificationDetails notificationDetails =
+            color: settingsProvider.customAccentColor,
+            ticker: 'Jegyek',
+          );
+          NotificationDetails notificationDetails =
               NotificationDetails(android: androidNotificationDetails);
+          if (userProvider.getUsers().length == 1) {
             await flutterLocalNotificationsPlugin.show(
-              // probably shouldn't use a random int
-              Random().nextInt(432234 * 2),
-              "title".i18n,
-              "body".i18n.fill([
+              grade.id.hashCode,
+              "title_grade".i18n,
+              "body_grade".i18n.fill(
+                [
                   grade.value.value.toString(),
                   grade.subject.isRenamed &&
                           settingsProvider.renamedSubjectsEnabled
                       ? grade.subject.renamedTo!
                       : grade.subject.name
-              ]),
-              notificationDetails);
+                ],
+              ),
+              notificationDetails,
+            );
+          } else {
+            // multiple users are added, also display student name
+            await flutterLocalNotificationsPlugin.show(
+              grade.id.hashCode,
+              "title_grade".i18n,
+              "body_grade_multiuser".i18n.fill(
+                [
+                  userProvider.displayName!,
+                  grade.value.value.toString(),
+                  grade.subject.isRenamed &&
+                          settingsProvider.renamedSubjectsEnabled
+                      ? grade.subject.renamedTo!
+                      : grade.subject.name
+                ],
+              ),
+              notificationDetails,
+            );
+          }
+        }
       }
     }
     // set grade seen status
     gradeProvider.seenAll();
   }
+
+  void absenceNotification() async {
+    // get absences from api
+    List? absenceJson = await kretaClient
+        .getAPI(KretaAPI.absences(userProvider.instituteCode ?? ""));
+    List<Absence> storedAbsences =
+        await database.userQuery.getAbsences(userId: userProvider.id!);
+    if (absenceJson == null) {
+      return;
+    }
+    // format api absences to correct format while preserving isSeen value
+    List<Absence> absences = absenceJson.map((e) {
+      Absence apiAbsence = Absence.fromJson(e);
+      Absence storedAbsence = storedAbsences.firstWhere(
+          (stored) => stored.id == apiAbsence.id,
+          orElse: () => apiAbsence);
+      apiAbsence.isSeen = storedAbsence.isSeen;
+      return apiAbsence;
+    }).toList();
+    List<Absence> modifiedAbsences = [];
+    if (absences != storedAbsences) {
+      // remove absences that are not new
+      absences.removeWhere((element) => storedAbsences.contains(element));
+      for (Absence absence in absences) {
+        if (!absence.isSeen) {
+          absence.isSeen = true;
+          modifiedAbsences.add(absence);
+          AndroidNotificationDetails androidNotificationDetails =
+              AndroidNotificationDetails(
+            'ABSENCES',
+            'Hiányzások',
+            channelDescription: 'Értesítés hiányzások beírásakor',
+            importance: Importance.max,
+            priority: Priority.max,
+            color: settingsProvider.customAccentColor,
+            ticker: 'Hiányzások',
+          );
+          NotificationDetails notificationDetails =
+              NotificationDetails(android: androidNotificationDetails);
+          if (userProvider.getUsers().length == 1) {
+            await flutterLocalNotificationsPlugin.show(
+              absence.id.hashCode,
+              "title_absence".i18n,
+              "body_absence".i18n.fill(
+                [
+                  DateFormat("yyyy-MM-dd").format(absence.date),
+                  absence.subject.isRenamed &&
+                          settingsProvider.renamedSubjectsEnabled
+                      ? absence.subject.renamedTo!
+                      : absence.subject.name
+                ],
+              ),
+              notificationDetails,
+            );
+          } else {
+            await flutterLocalNotificationsPlugin.show(
+              absence.id.hashCode,
+              "title_absence".i18n,
+              "body_absence_multiuser".i18n.fill(
+                [
+                  userProvider.displayName!,
+                  DateFormat("yyyy-MM-dd").format(absence.date),
+                  absence.subject.isRenamed &&
+                          settingsProvider.renamedSubjectsEnabled
+                      ? absence.subject.renamedTo!
+                      : absence.subject.name
+                ],
+              ),
+              notificationDetails,
+            );
+          }
+        }
+      }
+    }
+    // combine modified absences and storedabsences list and save them to the database
+    List<Absence> combinedAbsences = combineLists(
+      modifiedAbsences,
+      storedAbsences,
+      (Absence absence) => absence.id,
+    );
+    await database.userStore
+        .storeAbsences(combinedAbsences, userId: userProvider.id!);
+  }
+
+  void messageNotification() async {
+    // get messages from api
+    List? messageJson =
+        await kretaClient.getAPI(KretaAPI.messages("beerkezett"));
+    List<Message> storedmessages =
+        await database.userQuery.getMessages(userId: userProvider.id!);
+    if (messageJson == null) {
+      return;
+    }
+    // format api messages to correct format while preserving isSeen value
+    // Parse messages
+    List<Message> messages = [];
+    await Future.wait(List.generate(messageJson.length, (index) {
+      return () async {
+        Map message = messageJson.cast<Map>()[index];
+        Map? innerMessageJson = await kretaClient
+            .getAPI(KretaAPI.message(message["azonosito"].toString()));
+        if (innerMessageJson != null) {
+          messages.add(
+              Message.fromJson(innerMessageJson, forceType: MessageType.inbox));
+        }
+      }();
+    }));
+
+    for (Message message in messages) {
+      for (Message storedMessage in storedmessages) {
+        if (message.id == storedMessage.id) {
+          message.isSeen = storedMessage.isSeen;
+        }
+      }
+    }
+    List<Message> modifiedmessages = [];
+    if (messages != storedmessages) {
+      // remove messages that are not new
+      messages.removeWhere((element) => storedmessages.contains(element));
+      for (Message message in messages) {
+        if (!message.isSeen) {
+          message.isSeen = true;
+          modifiedmessages.add(message);
+          AndroidNotificationDetails androidNotificationDetails =
+              AndroidNotificationDetails(
+            'MESSAGES',
+            'Üzenetek',
+            channelDescription: 'Értesítés kapott üzenetekkor',
+            importance: Importance.max,
+            priority: Priority.max,
+            color: settingsProvider.customAccentColor,
+            ticker: 'Üzenetek',
+          );
+          NotificationDetails notificationDetails =
+              NotificationDetails(android: androidNotificationDetails);
+          if (userProvider.getUsers().length == 1) {
+            await flutterLocalNotificationsPlugin.show(
+              message.id.hashCode,
+              message.author,
+              message.content.replaceAll(RegExp(r'<[^>]*>'), ''),
+              notificationDetails,
+            );
+          } else {
+            await flutterLocalNotificationsPlugin.show(
+              message.id.hashCode,
+              "(${userProvider.displayName!}) ${message.author}",
+              message.content.replaceAll(RegExp(r'<[^>]*>'), ''),
+              notificationDetails,
+            );
+          }
+        }
+      }
+    }
+    // combine modified messages and storedmessages list and save them to the database
+    List<Message> combinedmessages = combineLists(
+      modifiedmessages,
+      storedmessages,
+      (Message message) => message.id,
+    );
+    await database.userStore
+        .storeMessages(combinedmessages, userId: userProvider.id!);
+  }
+
+  void lessonNotification() async {
+    // get lesson from api
+    TimetableProvider timetableProvider = TimetableProvider(
+        user: userProvider, database: database, kreta: kretaClient);
+    List<Lesson> storedlessons =
+        timetableProvider.lessons[Week.current()] ?? [];
+    List? apilessons = timetableProvider.getWeek(Week.current()) ?? [];
+    for (Lesson lesson in apilessons) {
+      for (Lesson storedLesson in storedlessons) {
+        if (lesson.id == storedLesson.id) {
+          lesson.isSeen = storedLesson.isSeen;
+        }
+      }
+    }
+    List<Lesson> modifiedlessons = [];
+    if (apilessons != storedlessons) {
+      // remove lessons that are not new
+      apilessons.removeWhere((element) => storedlessons.contains(element));
+      for (Lesson lesson in apilessons) {
+        if (!lesson.isSeen && lesson.isChanged) {
+          lesson.isSeen = true;
+          modifiedlessons.add(lesson);
+          AndroidNotificationDetails androidNotificationDetails =
+              AndroidNotificationDetails(
+            'LESSONS',
+            'Órák',
+            channelDescription:
+                'Értesítés órák elmaradásáról, helyettesítésről',
+            importance: Importance.max,
+            priority: Priority.max,
+            color: settingsProvider.customAccentColor,
+            ticker: 'Órák',
+          );
+          NotificationDetails notificationDetails =
+              NotificationDetails(android: androidNotificationDetails);
+          if (userProvider.getUsers().length == 1) {
+            if (lesson.status?.name == "Elmaradt") {
+              switch (I18n.localeStr) {
+                case "en_en":
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_canceled".i18n.fill(
+                        [
+                          lesson.lessonIndex,
+                          lesson.name,
+                          dayTitle(lesson.date)
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+                case "hu_hu":
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_canceled".i18n.fill(
+                        [
+                          dayTitle(lesson.date),
+                          lesson.lessonIndex,
+                          lesson.name
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+                default:
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_canceled".i18n.fill(
+                        [
+                          lesson.lessonIndex,
+                          lesson.name,
+                          dayTitle(lesson.date)
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+              }
+            } else if (lesson.substituteTeacher?.name != "") {
+              switch (I18n.localeStr) {
+                case "en_en":
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_substituted".i18n.fill(
+                        [
+                          lesson.lessonIndex,
+                          lesson.name,
+                          dayTitle(lesson.date),
+                          lesson.substituteTeacher!.isRenamed
+                              ? lesson.substituteTeacher!.renamedTo!
+                              : lesson.substituteTeacher!.name
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+                case "hu_hu":
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_substituted".i18n.fill(
+                        [
+                          dayTitle(lesson.date),
+                          lesson.lessonIndex,
+                          lesson.name,
+                          lesson.substituteTeacher!.isRenamed
+                              ? lesson.substituteTeacher!.renamedTo!
+                              : lesson.substituteTeacher!.name
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+                default:
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_substituted".i18n.fill(
+                        [
+                          lesson.lessonIndex,
+                          lesson.name,
+                          dayTitle(lesson.date),
+                          lesson.substituteTeacher!.isRenamed
+                              ? lesson.substituteTeacher!.renamedTo!
+                              : lesson.substituteTeacher!.name
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+              }
+            }
+          } else {
+            if (lesson.status?.name == "Elmaradt") {
+              switch (I18n.localeStr) {
+                case "en_en":
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_canceled".i18n.fill(
+                        [
+                          userProvider.displayName!,
+                          lesson.lessonIndex,
+                          lesson.name,
+                          dayTitle(lesson.date)
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+                case "hu_hu":
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_canceled".i18n.fill(
+                        [
+                          userProvider.displayName!,
+                          dayTitle(lesson.date),
+                          lesson.lessonIndex,
+                          lesson.name
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+                default:
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_canceled".i18n.fill(
+                        [
+                          userProvider.displayName!,
+                          lesson.lessonIndex,
+                          lesson.name,
+                          dayTitle(lesson.date)
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+              }
+            } else if (lesson.substituteTeacher?.name != "") {
+              switch (I18n.localeStr) {
+                case "en_en":
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_substituted".i18n.fill(
+                        [
+                          userProvider.displayName!,
+                          lesson.lessonIndex,
+                          lesson.name,
+                          dayTitle(lesson.date),
+                          lesson.substituteTeacher!.isRenamed
+                              ? lesson.substituteTeacher!.renamedTo!
+                              : lesson.substituteTeacher!.name
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+                case "hu_hu":
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_substituted".i18n.fill(
+                        [
+                          userProvider.displayName!,
+                          dayTitle(lesson.date),
+                          lesson.lessonIndex,
+                          lesson.name,
+                          lesson.substituteTeacher!.isRenamed
+                              ? lesson.substituteTeacher!.renamedTo!
+                              : lesson.substituteTeacher!.name
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+                default:
+                  {
+                    await flutterLocalNotificationsPlugin.show(
+                      lesson.id.hashCode,
+                      "title_lesson".i18n,
+                      "body_lesson_substituted".i18n.fill(
+                        [
+                          userProvider.displayName!,
+                          lesson.lessonIndex,
+                          lesson.name,
+                          dayTitle(lesson.date),
+                          lesson.substituteTeacher!.isRenamed
+                              ? lesson.substituteTeacher!.renamedTo!
+                              : lesson.substituteTeacher!.name
+                        ],
+                      ),
+                      notificationDetails,
+                    );
+                    break;
+                  }
+              }
+            }
+          }
+        }
+      }
+      // combine modified lesson and storedlesson list and save them to the database
+      List<Lesson> combinedlessons = combineLists(
+        modifiedlessons,
+        storedlessons,
+        (Lesson message) => message.id,
+      );
+      Map<Week, List<Lesson>> timetableLessons = timetableProvider.lessons;
+      timetableLessons[Week.current()] = combinedlessons;
+      await database.userStore
+          .storeLessons(timetableLessons, userId: userProvider.id!);
+    }
   }
 }

filcnaplo/lib/helpers/notification_helper.i18n.dart

@@ -4,16 +4,43 @@ extension Localization on String {
   static final _t = Translations.byLocale("hu_hu") +
       {
         "en_en": {
-          "title": "New grade",
-          "body": "You got a %s in %s"
+          "title_grade": "New grade",
+          "body_grade": "You got a %s in %s",
+          "body_grade_multiuser": "%s got a %s in %s",
+          "title_absence": "Absence recorded",
+          "body_absence": "An absence was recorded on %s for %s",
+          "body_absence_multiuser": "An absence was recorded for %s on %s for the subject %s",
+          "title_lesson": "Timetable modified",
+          "body_lesson_canceled": "Lesson #%s (%s) has been canceled on %s",
+          "body_lesson_canceled_multiuser": "(%s) Lesson #%s (%s) has been canceled on %s",
+          "body_lesson_substituted": "Lesson #%s (%s) on %s will be substituted by %s",
+          "body_lesson_substituted_multiuser": "(%s) Lesson #%s (%s) on %s will be substituted by %s"
         },
         "hu_hu": {
-          "title": "Új jegy",
-          "body": "%s-st kaptál %s tantárgyból"
+          "title_grade": "Új jegy",
+          "body_grade": "%s-st kaptál %s tantárgyból",
+          "body_grade_multiuser": "%s tanuló %s-st kapott %s tantárgyból",
+          "title_absence": "Új hiányzás",
+          "body_absence": "Új hiányzást kaptál %s napon %s tantárgyból",
+          "body_absence_multiuser": "%s tanuló új hiányzást kapott %s napon %s tantárgyból",
+          "title_lesson": "Órarend szerkesztve",
+          "body_lesson_canceled": "%s-i %s. óra (%s) elmarad",
+          "body_lesson_canceled_multiuser": "(%s) %s-i %s. óra (%s) elmarad",
+          "body_lesson_substituted": "%s-i %s. (%s) órát %s helyettesíti",
+          "body_lesson_substituted_multiuser": "(%s) %s-i %s. (%s) órát %s helyettesíti"
         },
         "de_de": {
-          "title": "Neue Note",
-          "body": "Du hast eine %s in %s"
+          "title_grade": "Neue Note",
+          "body_grade": "Du hast eine %s in %s",
+          "body_grade_multiuser": "%s hast eine %s in %s",
+          "title_absence": "Abwesenheit aufgezeichnet",
+          "body_absence": "Auf %s für %s wurde eine Abwesenheit aufgezeichnet",
+          "body_absence_multiuser": "Für %s wurde am %s für das Thema Mathematik eine Abwesenheit aufgezeichnet",
+          "title_lesson": "Fahrplan geändert",
+          "body_lesson_canceled": "Lektion Nr. %s (%s) wurde am %s abgesagt",
+          "body_lesson_canceled_multiuser": "(%s) Lektion Nr. %s (%s) wurde am %s abgesagt",
+          "body_lesson_substituted": "Lektion Nr. %s (%s) wird am %s durch %s ersetzt",
+          "body_lesson_substituted_multiuser": "(%s) Lektion Nr. %s (%s) wird am %s durch %s ersetzt"
         },
       };
 

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/update_helper.dart

@@ -6,6 +6,7 @@ import 'package:filcnaplo/api/client.dart';
 import 'package:filcnaplo/helpers/storage_helper.dart';
 import 'package:filcnaplo/models/release.dart';
 import 'package:open_file/open_file.dart';
+import 'package:permission_handler/permission_handler.dart';
 
 enum UpdateState { none, preparing, downloading, installing }
 
@@ -32,6 +33,10 @@ extension UpdateHelper on Release {
 
     updateCallback(-1, UpdateState.installing);
 
+    var installPerms =
+        (await Permission.manageExternalStorage.request().isGranted &&
+            await Permission.requestInstallPackages.request().isGranted);
+    if (installPerms) {
       var result = await OpenFile.open(apk.path);
 
       if (result.type != ResultType.done) {
@@ -39,6 +44,7 @@ extension UpdateHelper on Release {
         print("ERROR: installUpdate.openFile: ${result.message}");
         throw result.message;
       }
+    }
 
     updateCallback(-1, UpdateState.none);
   }

filcnaplo/lib/main.dart

@@ -32,7 +32,8 @@ void main() async {
   runApp(App(
     database: startup.database,
     settings: startup.settings,
-      user: startup.user));
+    user: startup.user,
+  ));
 }
 
 class Startup {
@@ -48,13 +49,17 @@ class Startup {
     settings = await database.query.getSettings(database);
     user = await database.query.getUsers(settings);
 
+    late FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin;
     // Notifications setup
+    if (!kIsWeb) {
       initPlatformState();
-    FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
-        FlutterLocalNotificationsPlugin();
+      flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
+    }
 
     // Get permission to show notifications
-    if (Platform.isAndroid) {
+    if (kIsWeb) {
+      // do nothing
+    } else if (Platform.isAndroid) {
       await flutterLocalNotificationsPlugin
           .resolvePlatformSpecificImplementation<
               AndroidFlutterLocalNotificationsPlugin>()!
@@ -77,9 +82,12 @@ class Startup {
             badge: true,
             sound: true,
           );
+    } else if (Platform.isLinux) {
+      // no permissions are needed on linux
     }
 
     // Platform specific settings
+    if (!kIsWeb) {
       const DarwinInitializationSettings initializationSettingsDarwin =
           DarwinInitializationSettings(
         requestSoundPermission: true,
@@ -88,11 +96,15 @@ class Startup {
       );
       const AndroidInitializationSettings initializationSettingsAndroid =
           AndroidInitializationSettings('ic_notification');
+      const LinuxInitializationSettings initializationSettingsLinux =
+          LinuxInitializationSettings(defaultActionName: 'Open notification');
       const InitializationSettings initializationSettings =
           InitializationSettings(
         android: initializationSettingsAndroid,
         iOS: initializationSettingsDarwin,
-            macOS: initializationSettingsDarwin);
+        macOS: initializationSettingsDarwin,
+        linux: initializationSettingsLinux,
+      );
 
       // Initialize notifications
       await flutterLocalNotificationsPlugin.initialize(
@@ -100,6 +112,7 @@ class Startup {
       );
     }
   }
+}
 
 bool errorShown = false;
 String lastException = '';

filcnaplo/lib/models/ad.dart

@@ -0,0 +1,38 @@
+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) {
+    print(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/news.dart

@@ -1,30 +1,36 @@
 class News {
+  String id;
   String title;
   String content;
   String link;
   String openLabel;
   String platform;
   bool emergency;
+  DateTime expireDate;
   Map? json;
 
   News({
+    required this.id,
     required this.title,
     required this.content,
     required this.link,
     required this.openLabel,
     required this.platform,
     required this.emergency,
+    required this.expireDate,
     this.json,
   });
 
   factory News.fromJson(Map json) {
     return News(
+      id: json["id"] ?? "",
       title: json["title"] ?? "",
       content: json["content"] ?? "",
       link: json["link"] ?? "",
       openLabel: json["open_label"] ?? "",
       platform: json["platform"] ?? "",
       emergency: json["emergency"] ?? false,
+      expireDate: DateTime.parse(json["expire_date"] ?? ''),
       json: json,
     );
   }

filcnaplo/lib/models/settings.dart

@@ -29,8 +29,12 @@ class SettingsProvider extends ChangeNotifier {
   // zero is one, ...
   List<Color> _gradeColors;
   bool _newsEnabled;
-  int _newsState;
+  String _seenNews;
   bool _notificationsEnabled;
+  bool _notificationsGradesEnabled;
+  bool _notificationsAbsencesEnabled;
+  bool _notificationsMessagesEnabled;
+  bool _notificationsLessonsEnabled;
   /*
   notificationsBitfield values:
 
@@ -69,6 +73,9 @@ class SettingsProvider extends ChangeNotifier {
   String _lastAccountId;
   bool _renamedSubjectsEnabled;
   bool _renamedSubjectsItalics;
+  bool _renamedTeachersEnabled;
+  bool _renamedTeachersItalics;
+  Color _liveActivityColor;
 
   SettingsProvider({
     DatabaseProvider? database,
@@ -79,8 +86,12 @@ class SettingsProvider extends ChangeNotifier {
     required AccentColor accentColor,
     required List<Color> gradeColors,
     required bool newsEnabled,
-    required int newsState,
+    required String seenNews,
     required bool notificationsEnabled,
+    required bool notificationsGradesEnabled,
+    required bool notificationsAbsencesEnabled,
+    required bool notificationsMessagesEnabled,
+    required bool notificationsLessonsEnabled,
     required int notificationsBitfield,
     required bool developerMode,
     required int notificationPollInterval,
@@ -106,6 +117,9 @@ class SettingsProvider extends ChangeNotifier {
     required String lastAccountId,
     required bool renameSubjectsEnabled,
     required bool renameSubjectsItalics,
+    required bool renameTeachersEnabled,
+    required bool renameTeachersItalics,
+    required Color liveActivityColor,
   })  : _database = database,
         _language = language,
         _startPage = startPage,
@@ -114,8 +128,12 @@ class SettingsProvider extends ChangeNotifier {
         _accentColor = accentColor,
         _gradeColors = gradeColors,
         _newsEnabled = newsEnabled,
-        _newsState = newsState,
+        _seenNews = seenNews,
         _notificationsEnabled = notificationsEnabled,
+        _notificationsGradesEnabled = notificationsGradesEnabled,
+        _notificationsAbsencesEnabled = notificationsAbsencesEnabled,
+        _notificationsMessagesEnabled = notificationsMessagesEnabled,
+        _notificationsLessonsEnabled = notificationsLessonsEnabled,
         _notificationsBitfield = notificationsBitfield,
         _developerMode = developerMode,
         _notificationPollInterval = notificationPollInterval,
@@ -140,7 +158,10 @@ class SettingsProvider extends ChangeNotifier {
         _premiumLogin = premiumLogin,
         _lastAccountId = lastAccountId,
         _renamedSubjectsEnabled = renameSubjectsEnabled,
-        _renamedSubjectsItalics = renameSubjectsItalics;
+        _renamedSubjectsItalics = renameSubjectsItalics,
+        _renamedTeachersEnabled = renameTeachersEnabled,
+        _renamedTeachersItalics = renameTeachersItalics,
+        _liveActivityColor = liveActivityColor;
 
   factory SettingsProvider.fromMap(Map map,
       {required DatabaseProvider database}) {
@@ -167,8 +188,12 @@ class SettingsProvider extends ChangeNotifier {
         Color(map["grade_color5"]),
       ],
       newsEnabled: map["news"] == 1,
-      newsState: map["news_state"],
+      seenNews: map["seen_news"],
       notificationsEnabled: map["notifications"] == 1,
+      notificationsGradesEnabled: map["notifications_grades"] == 1,
+      notificationsAbsencesEnabled: map["notifications_absences"] == 1,
+      notificationsMessagesEnabled: map["notifications_messages"] == 1,
+      notificationsLessonsEnabled: map["notifications_lessons"] == 1,
       notificationsBitfield: map["notifications_bitfield"],
       notificationPollInterval: map["notification_poll_interval"],
       developerMode: map["developer_mode"] == 1,
@@ -195,6 +220,9 @@ class SettingsProvider extends ChangeNotifier {
       lastAccountId: map["last_account_id"],
       renameSubjectsEnabled: map["renamed_subjects_enabled"] == 1,
       renameSubjectsItalics: map["renamed_subjects_italics"] == 1,
+      renameTeachersEnabled: map["renamed_teachers_enabled"] == 1,
+      renameTeachersItalics: map["renamed_teachers_italics"] == 1,
+      liveActivityColor: Color(map["live_activity_color"]),
     );
   }
 
@@ -206,8 +234,12 @@ class SettingsProvider extends ChangeNotifier {
       "theme": _theme.index,
       "accent_color": _accentColor.index,
       "news": _newsEnabled ? 1 : 0,
-      "news_state": _newsState,
+      "seen_news": _seenNews,
       "notifications": _notificationsEnabled ? 1 : 0,
+      "notifications_grades": _notificationsGradesEnabled ? 1 : 0,
+      "notifications_absences": _notificationsAbsencesEnabled ? 1 : 0,
+      "notifications_messages": _notificationsMessagesEnabled ? 1 : 0,
+      "notifications_lessons": _notificationsLessonsEnabled ? 1 : 0,
       "notifications_bitfield": _notificationsBitfield,
       "developer_mode": _developerMode ? 1 : 0,
       "grade_color1": _gradeColors[0].value,
@@ -236,7 +268,10 @@ class SettingsProvider extends ChangeNotifier {
       "premium_login": _premiumLogin,
       "last_account_id": _lastAccountId,
       "renamed_subjects_enabled": _renamedSubjectsEnabled ? 1 : 0,
-      "renamed_subjects_italics": _renamedSubjectsItalics ? 1 : 0
+      "renamed_subjects_italics": _renamedSubjectsItalics ? 1 : 0,
+      "renamed_teachers_enabled": _renamedTeachersEnabled ? 1 : 0,
+      "renamed_teachers_italics": _renamedTeachersItalics ? 1 : 0,
+      "live_activity_color": _liveActivityColor.value,
     };
   }
 
@@ -256,8 +291,12 @@ class SettingsProvider extends ChangeNotifier {
         DarkMobileAppColors().gradeFive,
       ],
       newsEnabled: true,
-      newsState: -1,
+      seenNews: '',
       notificationsEnabled: true,
+      notificationsGradesEnabled: true,
+      notificationsAbsencesEnabled: true,
+      notificationsMessagesEnabled: true,
+      notificationsLessonsEnabled: true,
       notificationsBitfield: 255,
       developerMode: false,
       notificationPollInterval: 1,
@@ -274,7 +313,7 @@ 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),
       premiumScopes: [PremiumScopes.all],
@@ -283,6 +322,9 @@ class SettingsProvider extends ChangeNotifier {
       lastAccountId: "",
       renameSubjectsEnabled: false,
       renameSubjectsItalics: false,
+      renameTeachersEnabled: false,
+      renameTeachersItalics: false,
+      liveActivityColor: const Color(0xFF676767),
     );
   }
 
@@ -294,8 +336,12 @@ class SettingsProvider extends ChangeNotifier {
   AccentColor get accentColor => _accentColor;
   List<Color> get gradeColors => _gradeColors;
   bool get newsEnabled => _newsEnabled;
-  int get newsState => _newsState;
+  List<String> get seenNews => _seenNews.split(',');
   bool get notificationsEnabled => _notificationsEnabled;
+  bool get notificationsGradesEnabled => _notificationsGradesEnabled;
+  bool get notificationsAbsencesEnabled => _notificationsAbsencesEnabled;
+  bool get notificationsMessagesEnabled => _notificationsMessagesEnabled;
+  bool get notificationsLessonsEnabled => _notificationsLessonsEnabled;
   int get notificationsBitfield => _notificationsBitfield;
   bool get developerMode => _developerMode;
   int get notificationPollInterval => _notificationPollInterval;
@@ -324,6 +370,9 @@ class SettingsProvider extends ChangeNotifier {
   String get lastAccountId => _lastAccountId;
   bool get renamedSubjectsEnabled => _renamedSubjectsEnabled;
   bool get renamedSubjectsItalics => _renamedSubjectsItalics;
+  bool get renamedTeachersEnabled => _renamedTeachersEnabled;
+  bool get renamedTeachersItalics => _renamedTeachersItalics;
+  Color get liveActivityColor => _liveActivityColor;
 
   Future<void> update({
     bool store = true,
@@ -334,8 +383,12 @@ class SettingsProvider extends ChangeNotifier {
     AccentColor? accentColor,
     List<Color>? gradeColors,
     bool? newsEnabled,
-    int? newsState,
+    String? seenNewsId,
     bool? notificationsEnabled,
+    bool? notificationsGradesEnabled,
+    bool? notificationsAbsencesEnabled,
+    bool? notificationsMessagesEnabled,
+    bool? notificationsLessonsEnabled,
     int? notificationsBitfield,
     bool? developerMode,
     int? notificationPollInterval,
@@ -361,6 +414,9 @@ class SettingsProvider extends ChangeNotifier {
     String? lastAccountId,
     bool? renamedSubjectsEnabled,
     bool? renamedSubjectsItalics,
+    bool? renamedTeachersEnabled,
+    bool? renamedTeachersItalics,
+    Color? liveActivityColor,
   }) async {
     if (language != null && language != _language) _language = language;
     if (startPage != null && startPage != _startPage) _startPage = startPage;
@@ -375,11 +431,31 @@ class SettingsProvider extends ChangeNotifier {
     if (newsEnabled != null && newsEnabled != _newsEnabled) {
       _newsEnabled = newsEnabled;
     }
-    if (newsState != null && newsState != _newsState) _newsState = newsState;
+    if (seenNewsId != null && !_seenNews.split(',').contains(seenNewsId)) {
+      var tempList = _seenNews.split(',');
+      tempList.add(seenNewsId);
+      _seenNews = tempList.join(',');
+    }
     if (notificationsEnabled != null &&
         notificationsEnabled != _notificationsEnabled) {
       _notificationsEnabled = notificationsEnabled;
     }
+    if (notificationsGradesEnabled != null &&
+        notificationsGradesEnabled != _notificationsGradesEnabled) {
+      _notificationsGradesEnabled = notificationsGradesEnabled;
+    }
+    if (notificationsAbsencesEnabled != null &&
+        notificationsAbsencesEnabled != _notificationsAbsencesEnabled) {
+      _notificationsAbsencesEnabled = notificationsAbsencesEnabled;
+    }
+    if (notificationsMessagesEnabled != null &&
+        notificationsMessagesEnabled != _notificationsMessagesEnabled) {
+      _notificationsMessagesEnabled = notificationsMessagesEnabled;
+    }
+    if (notificationsLessonsEnabled != null &&
+        notificationsLessonsEnabled != _notificationsLessonsEnabled) {
+      _notificationsLessonsEnabled = notificationsLessonsEnabled;
+    }
     if (notificationsBitfield != null &&
         notificationsBitfield != _notificationsBitfield) {
       _notificationsBitfield = notificationsBitfield;
@@ -448,6 +524,17 @@ class SettingsProvider extends ChangeNotifier {
         renamedSubjectsItalics != _renamedSubjectsItalics) {
       _renamedSubjectsItalics = renamedSubjectsItalics;
     }
+    if (renamedTeachersEnabled != null &&
+        renamedTeachersEnabled != _renamedTeachersEnabled) {
+      _renamedTeachersEnabled = renamedTeachersEnabled;
+    }
+    if (renamedTeachersItalics != null &&
+        renamedTeachersItalics != _renamedTeachersItalics) {
+      _renamedTeachersItalics = renamedTeachersItalics;
+    }
+    if (liveActivityColor != null && liveActivityColor != _liveActivityColor) {
+      _liveActivityColor = liveActivityColor;
+    }
     if (store) await _database?.store.storeSettings(this);
     notifyListeners();
   }

filcnaplo/lib/models/shared_theme.dart

@@ -0,0 +1,33 @@
+import 'dart:ui';
+
+class SharedTheme {
+  Map json;
+  String id;
+  bool isPublic;
+  String nickname;
+  Color backgroundColor;
+  Color panelsColor;
+  Color accentColor;
+
+  SharedTheme({
+    required this.json,
+    required this.id,
+    this.isPublic = false,
+    this.nickname = 'Anonymous',
+    required this.backgroundColor,
+    required this.panelsColor,
+    required this.accentColor,
+  });
+
+  factory SharedTheme.fromJson(Map json) {
+    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']),
+    );
+  }
+}

filcnaplo/lib/ui/filter/sort.dart

@@ -12,7 +12,8 @@ import 'package:filcnaplo_mobile_ui/common/widgets/lesson/changed_lesson_tile.da
 import 'package:filcnaplo/utils/format.dart';
 
 // difference.inDays is not reliable
-bool _sameDate(DateTime a, DateTime b) => (a.year == b.year && a.month == b.month && a.day == b.day);
+bool _sameDate(DateTime a, DateTime b) =>
+    (a.year == b.year && a.month == b.month && a.day == b.day);
 
 List<Widget> sortDateWidgets(
   BuildContext context, {
@@ -35,13 +36,16 @@ List<Widget> sortDateWidgets(
       if (message.conversationId != null) {
         convMessages.add(w);
 
-        Conversation conv = conversations.firstWhere((e) => e.id == message.conversationId, orElse: () => Conversation(id: message.conversationId!));
+        Conversation conv = conversations.firstWhere(
+            (e) => e.id == message.conversationId,
+            orElse: () => Conversation(id: message.conversationId!));
         conv.add(message);
         if (conv.messages.length == 1) conversations.add(conv);
       }
 
       if (conversations.any((c) => c.id == message.messageId)) {
-        Conversation conv = conversations.firstWhere((e) => e.id == message.messageId);
+        Conversation conv =
+            conversations.firstWhere((e) => e.id == message.messageId);
         convMessages.add(w);
         conv.add(message);
       }
@@ -87,26 +91,41 @@ List<Widget> sortDateWidgets(
 
       // Group Absence Tiles
       List<DateWidget> absenceTileWidgets = elements.where((element) {
-        return element.widget is AbsenceViewable && (element.widget as AbsenceViewable).absence.delay == 0;
+        return element.widget is AbsenceViewable &&
+            (element.widget as AbsenceViewable).absence.delay == 0;
       }).toList();
-      List<AbsenceViewable> absenceTiles = absenceTileWidgets.map((e) => e.widget as AbsenceViewable).toList();
+      List<AbsenceViewable> absenceTiles =
+          absenceTileWidgets.map((e) => e.widget as AbsenceViewable).toList();
       if (absenceTiles.length > 1) {
-        elements.removeWhere((element) => element.widget.runtimeType == AbsenceViewable && (element.widget as AbsenceViewable).absence.delay == 0);
+        elements.removeWhere((element) =>
+            element.widget.runtimeType == AbsenceViewable &&
+            (element.widget as AbsenceViewable).absence.delay == 0);
         if (elements.isEmpty) {
           cst = false;
         }
-        elements.add(DateWidget(
-            widget: AbsenceGroupTile(absenceTiles, showDate: !cst),
+        elements.add(
+          DateWidget(
+              widget: AbsenceGroupTile(
+                absenceTiles,
+                showDate: !cst,
+                padding: const EdgeInsets.symmetric(horizontal: 6.0),
+              ),
               date: absenceTileWidgets.first.date,
-            key: "${absenceTileWidgets.first.date.millisecondsSinceEpoch}-absence-group"));
+              key:
+                  "${absenceTileWidgets.first.date.millisecondsSinceEpoch}-absence-group"),
+        );
       }
 
       // Bring Lesson Tiles to front & sort by index asc
       List<DateWidget> lessonTiles = elements.where((element) {
         return element.widget.runtimeType == ChangedLessonTile;
       }).toList();
-      lessonTiles.sort((a, b) => (a.widget as ChangedLessonTile).lesson.lessonIndex.compareTo((b.widget as ChangedLessonTile).lesson.lessonIndex));
-      elements.removeWhere((element) => element.widget.runtimeType == ChangedLessonTile);
+      lessonTiles.sort((a, b) => (a.widget as ChangedLessonTile)
+          .lesson
+          .lessonIndex
+          .compareTo((b.widget as ChangedLessonTile).lesson.lessonIndex));
+      elements.removeWhere(
+          (element) => element.widget.runtimeType == ChangedLessonTile);
       elements.insertAll(0, lessonTiles);
 
       final date = (elements + absenceTileWidgets).first.date;
@@ -122,7 +141,8 @@ List<Widget> sortDateWidgets(
             spawnIsolate: false,
             shrinkWrap: true,
             physics: const NeverScrollableScrollPhysics(),
-            itemBuilder: (context, animation, item, index) => filterItemBuilder(context, animation, item.widget, index),
+            itemBuilder: (context, animation, item, index) =>
+                filterItemBuilder(context, animation, item.widget, index),
             items: elements,
           ),
         ),
@@ -131,9 +151,12 @@ List<Widget> sortDateWidgets(
   }
 
   final nh = DateTime.now();
-  final now = DateTime(nh.year, nh.month, nh.day).subtract(const Duration(seconds: 1));
+  final now =
+      DateTime(nh.year, nh.month, nh.day).subtract(const Duration(seconds: 1));
 
-  if (showDivider && items.any((i) => i.date.isBefore(now)) && items.any((i) => i.date.isAfter(now))) {
+  if (showDivider &&
+      items.any((i) => i.date.isBefore(now)) &&
+      items.any((i) => i.date.isAfter(now))) {
     items.add(
       DateWidget(
         date: now,
@@ -153,7 +176,9 @@ List<Widget> sortDateWidgets(
   }
 
   // Sort future dates asc, past dates desc
-  items.sort((a, b) => (a.date.isAfter(now) && b.date.isAfter(now) ? 1 : -1) * a.date.compareTo(b.date));
+  items.sort((a, b) =>
+      (a.date.isAfter(now) && b.date.isAfter(now) ? 1 : -1) *
+      a.date.compareTo(b.date));
 
   return items.map((e) => e.widget).toList();
 }

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,7 +94,9 @@ Future<List<DateWidget>> getFilterWidgets(FilterType activeData,
 
     // Grades
     case FilterType.grades:
+      if (!settingsProvider.gradeOpeningFun) {
         gradeProvider.seenAll();
+      }
       items = grade_filter.getWidgets(
           gradeProvider.grades, gradeProvider.lastSeenDate);
       if (settingsProvider.gradeOpeningFun) {
@@ -162,6 +169,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;
 }

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

@@ -192,6 +192,7 @@ class GradeValueWidget extends StatelessWidget {
     this.outline = false,
     this.complemented = false,
     this.nocolor = false,
+    this.color,
   }) : super(key: key);
 
   final GradeValue value;
@@ -202,6 +203,7 @@ class GradeValueWidget extends StatelessWidget {
   final bool outline;
   final bool complemented;
   final bool nocolor;
+  final Color? color;
 
   @override
   Widget build(BuildContext context) {
@@ -209,7 +211,7 @@ class GradeValueWidget extends StatelessWidget {
     bool isSubjectView = SubjectGradesContainer.of(context) != null;
 
     Color color =
-        gradeColor(context: context, value: value.value, nocolor: nocolor);
+        this.color ?? gradeColor(context: context, value: value.value, nocolor: nocolor);
     Widget valueText;
     final percentage = value.percentage;
 

filcnaplo/lib/ui/widgets/lesson/lesson_tile.dart

@@ -44,7 +44,8 @@ class LessonTile extends StatelessWidget {
       fillLeading = true;
     }
 
-    if (lesson.substituteTeacher != "") {
+    if (lesson.substituteTeacher != null &&
+        lesson.substituteTeacher?.name != "") {
       fill = true;
       accent = AppColors.of(context).yellow;
     }
@@ -113,7 +114,7 @@ class LessonTile extends StatelessWidget {
       if (lesson.isChanged) {
         if (lesson.status?.name == "Elmaradt") {
           description = 'cancelled'.i18n;
-        } else if (lesson.substituteTeacher != "") {
+        } else if (lesson.substituteTeacher?.name != "") {
           description = 'substitution'.i18n;
         }
       }
@@ -161,8 +162,10 @@ class LessonTile extends StatelessWidget {
                         color: AppColors.of(context)
                             .text
                             .withOpacity(!lesson.isEmpty ? 1.0 : 0.5),
-                        fontStyle:
-                            lesson.subject.isRenamed && settingsProvider.renamedSubjectsItalics ? FontStyle.italic : null),
+                        fontStyle: lesson.subject.isRenamed &&
+                                settingsProvider.renamedSubjectsItalics
+                            ? FontStyle.italic
+                            : null),
                   ),
                   subtitle: description != ""
                       ? Text(

filcnaplo/linux/flutter/generated_plugin_registrant.cc

@@ -1,27 +0,0 @@
-//
-//  Generated file. Do not edit.
-//
-
-// clang-format off
-
-#include "generated_plugin_registrant.h"
-
-#include <dynamic_color/dynamic_color_plugin.h>
-#include <file_selector_linux/file_selector_plugin.h>
-#include <flutter_acrylic/flutter_acrylic_plugin.h>
-#include <url_launcher_linux/url_launcher_plugin.h>
-
-void fl_register_plugins(FlPluginRegistry* registry) {
-  g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
-  dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
-  g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
-  file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
-  g_autoptr(FlPluginRegistrar) flutter_acrylic_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterAcrylicPlugin");
-  flutter_acrylic_plugin_register_with_registrar(flutter_acrylic_registrar);
-  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
-  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
-}

filcnaplo/linux/flutter/generated_plugin_registrant.h

@@ -1,15 +0,0 @@
-//
-//  Generated file. Do not edit.
-//
-
-// clang-format off
-
-#ifndef GENERATED_PLUGIN_REGISTRANT_
-#define GENERATED_PLUGIN_REGISTRANT_
-
-#include <flutter_linux/flutter_linux.h>
-
-// Registers Flutter plugins.
-void fl_register_plugins(FlPluginRegistry* registry);
-
-#endif  // GENERATED_PLUGIN_REGISTRANT_

filcnaplo/linux/flutter/generated_plugins.cmake

@@ -1,27 +0,0 @@
-#
-# Generated file, do not edit.
-#
-
-list(APPEND FLUTTER_PLUGIN_LIST
-  dynamic_color
-  file_selector_linux
-  flutter_acrylic
-  url_launcher_linux
-)
-
-list(APPEND FLUTTER_FFI_PLUGIN_LIST
-)
-
-set(PLUGIN_BUNDLED_LIBRARIES)
-
-foreach(plugin ${FLUTTER_PLUGIN_LIST})
-  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
-  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
-endforeach(plugin)
-
-foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
-  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
-  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
-endforeach(ffi_plugin)

filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -1,30 +0,0 @@
-//
-//  Generated file. Do not edit.
-//
-
-import FlutterMacOS
-import Foundation
-
-import connectivity_plus
-import dynamic_color
-import file_selector_macos
-import flutter_local_notifications
-import macos_window_utils
-import package_info_plus
-import path_provider_foundation
-import share_plus
-import sqflite
-import url_launcher_macos
-
-func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
-  DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
-  FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
-  FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
-  MacOSWindowUtilsPlugin.register(with: registry.registrar(forPlugin: "MacOSWindowUtilsPlugin"))
-  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
-  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
-  SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
-  SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))
-  UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
-}

filcnaplo/macos/Podfile.lock

@@ -1,78 +0,0 @@
-PODS:
-  - connectivity_plus (0.0.1):
-    - FlutterMacOS
-    - ReachabilitySwift
-  - dynamic_color (0.0.2):
-    - FlutterMacOS
-  - flutter_acrylic (0.1.0):
-    - FlutterMacOS
-  - flutter_local_notifications (0.0.1):
-    - FlutterMacOS
-  - FlutterMacOS (1.0.0)
-  - FMDB (2.7.5):
-    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.5)
-  - path_provider_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - ReachabilitySwift (5.0.0)
-  - share_plus_macos (0.0.1):
-    - FlutterMacOS
-  - sqflite (0.0.2):
-    - FlutterMacOS
-    - FMDB (>= 2.7.5)
-  - url_launcher_macos (0.0.1):
-    - FlutterMacOS
-
-DEPENDENCIES:
-  - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
-  - dynamic_color (from `Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos`)
-  - flutter_acrylic (from `Flutter/ephemeral/.symlinks/plugins/flutter_acrylic/macos`)
-  - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`)
-  - FlutterMacOS (from `Flutter/ephemeral`)
-  - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
-  - share_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos`)
-  - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`)
-  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
-
-SPEC REPOS:
-  trunk:
-    - FMDB
-    - ReachabilitySwift
-
-EXTERNAL SOURCES:
-  connectivity_plus:
-    :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
-  dynamic_color:
-    :path: Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos
-  flutter_acrylic:
-    :path: Flutter/ephemeral/.symlinks/plugins/flutter_acrylic/macos
-  flutter_local_notifications:
-    :path: Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos
-  FlutterMacOS:
-    :path: Flutter/ephemeral
-  path_provider_foundation:
-    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
-  share_plus_macos:
-    :path: Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos
-  sqflite:
-    :path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos
-  url_launcher_macos:
-    :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
-
-SPEC CHECKSUMS:
-  connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747
-  dynamic_color: 2eaa27267de1ca20d879fbd6e01259773fb1670f
-  flutter_acrylic: c3df24ae52ab6597197837ce59ef2a8542640c17
-  flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
-  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
-  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4
-  sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea
-  url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451
-
-PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
-
-COCOAPODS: 1.12.1

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.1.1+215
+version: 4.2.3+223
 
 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
@@ -66,6 +66,11 @@ dependencies:
   flutter_local_notifications: ^14.1.0
   package_info_plus: ^4.0.2
   screenshot: ^2.1.0
+  flutter_staggered_grid_view: ^0.7.0
+  sqflite_common_ffi_web: ^0.4.0
+  image_crop:
+    git:
+      url: https://github.com/kimaah/image_crop.git
 
 dev_dependencies:
   flutter_lints: ^2.0.1
@@ -81,6 +86,7 @@ flutter:
     - assets/icons/ic_splash.png
     - assets/animations/
     - assets/images/
+    - assets/images/subject_covers/
 
   fonts:
     - family: FilcIcons

filcnaplo/test/widget_test.dart

@@ -0,0 +1,30 @@
+// // This is a basic Flutter widget test.
+// //
+// // To perform an interaction with a widget in your test, use the WidgetTester
+// // utility in the flutter_test package. For example, you can send tap and scroll
+// // gestures. You can also use WidgetTester to find child widgets in the widget
+// // tree, read text, and verify that the values of widget properties are correct.
+
+// import 'package:flutter/material.dart';
+// import 'package:flutter_test/flutter_test.dart';
+
+// import 'package:filcnaplo/main.dart';
+
+// void main() {
+//   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+//     // Build our app and trigger a frame.
+//     await tester.pumpWidget(const MyApp());
+
+//     // Verify that our counter starts at 0.
+//     expect(find.text('0'), findsOneWidget);
+//     expect(find.text('1'), findsNothing);
+
+//     // Tap the '+' icon and trigger a frame.
+//     await tester.tap(find.byIcon(Icons.add));
+//     await tester.pump();
+
+//     // Verify that our counter has incremented.
+//     expect(find.text('0'), findsNothing);
+//     expect(find.text('1'), findsOneWidget);
+//   });
+// }

filcnaplo/web/index.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    For more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
+  -->
+  <base href="$FLUTTER_BASE_HREF">
+
+  <meta charset="UTF-8">
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta name="description" content="A new Flutter project.">
+
+  <!-- iOS meta tags & icons -->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-title" content="filcnaplo">
+  <link rel="apple-touch-icon" href="icons/Icon-192.png">
+
+  <!-- Favicon -->
+  <link rel="icon" type="image/png" href="favicon.png"/>
+
+  <title>filcnaplo</title>
+  <link rel="manifest" href="manifest.json">
+
+  <script>
+    // The value below is injected by flutter build, do not touch.
+    var serviceWorkerVersion = null;
+  </script>
+  <!-- This script adds the flutter initialization JS code -->
+  <script src="flutter.js" defer></script>
+</head>
+<body>
+  <script>
+    window.addEventListener('load', function(ev) {
+      // Download main.dart.js
+      _flutter.loader.loadEntrypoint({
+        serviceWorker: {
+          serviceWorkerVersion: serviceWorkerVersion,
+        },
+        onEntrypointLoaded: function(engineInitializer) {
+          engineInitializer.initializeEngine().then(function(appRunner) {
+            appRunner.runApp();
+          });
+        }
+      });
+    });
+  </script>
+</body>
+</html>

filcnaplo/web/manifest.json

@@ -0,0 +1,35 @@
+{
+    "name": "filcnaplo",
+    "short_name": "filcnaplo",
+    "start_url": ".",
+    "display": "standalone",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "A new Flutter project.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-maskable-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icons/Icon-maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ]
+}

filcnaplo/windows/.gitignore

@@ -0,0 +1,17 @@
+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/windows/runner/Runner.rc

@@ -0,0 +1,121 @@
+// Microsoft Visual C++ generated resource script.
+//
+#pragma code_page(65001)
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
+#else
+#define VERSION_AS_NUMBER 1,0,0,0
+#endif
+
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
+#else
+#define VERSION_AS_STRING "1.0.0"
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION VERSION_AS_NUMBER
+ PRODUCTVERSION VERSION_AS_NUMBER
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "CompanyName", "hu.refilc" "\0"
+            VALUE "FileDescription", "filcnaplo" "\0"
+            VALUE "FileVersion", VERSION_AS_STRING "\0"
+            VALUE "InternalName", "filcnaplo" "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2023 hu.refilc. All rights reserved." "\0"
+            VALUE "OriginalFilename", "filcnaplo.exe" "\0"
+            VALUE "ProductName", "filcnaplo" "\0"
+            VALUE "ProductVersion", VERSION_AS_STRING "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED

filcnaplo/windows/runner/flutter_window.cpp

@@ -0,0 +1,66 @@
+#include "flutter_window.h"
+
+#include <optional>
+
+#include "flutter/generated_plugin_registrant.h"
+
+FlutterWindow::FlutterWindow(const flutter::DartProject& project)
+    : project_(project) {}
+
+FlutterWindow::~FlutterWindow() {}
+
+bool FlutterWindow::OnCreate() {
+  if (!Win32Window::OnCreate()) {
+    return false;
+  }
+
+  RECT frame = GetClientArea();
+
+  // The size here must match the window dimensions to avoid unnecessary surface
+  // creation / destruction in the startup path.
+  flutter_controller_ = std::make_unique<flutter::FlutterViewController>(
+      frame.right - frame.left, frame.bottom - frame.top, project_);
+  // Ensure that basic setup of the controller was successful.
+  if (!flutter_controller_->engine() || !flutter_controller_->view()) {
+    return false;
+  }
+  RegisterPlugins(flutter_controller_->engine());
+  SetChildContent(flutter_controller_->view()->GetNativeWindow());
+
+  flutter_controller_->engine()->SetNextFrameCallback([&]() {
+    this->Show();
+  });
+
+  return true;
+}
+
+void FlutterWindow::OnDestroy() {
+  if (flutter_controller_) {
+    flutter_controller_ = nullptr;
+  }
+
+  Win32Window::OnDestroy();
+}
+
+LRESULT
+FlutterWindow::MessageHandler(HWND hwnd, UINT const message,
+                              WPARAM const wparam,
+                              LPARAM const lparam) noexcept {
+  // Give Flutter, including plugins, an opportunity to handle window messages.
+  if (flutter_controller_) {
+    std::optional<LRESULT> result =
+        flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam,
+                                                      lparam);
+    if (result) {
+      return *result;
+    }
+  }
+
+  switch (message) {
+    case WM_FONTCHANGE:
+      flutter_controller_->engine()->ReloadSystemFonts();
+      break;
+  }
+
+  return Win32Window::MessageHandler(hwnd, message, wparam, lparam);
+}

filcnaplo/windows/runner/flutter_window.h

@@ -0,0 +1,33 @@
+#ifndef RUNNER_FLUTTER_WINDOW_H_
+#define RUNNER_FLUTTER_WINDOW_H_
+
+#include <flutter/dart_project.h>
+#include <flutter/flutter_view_controller.h>
+
+#include <memory>
+
+#include "win32_window.h"
+
+// A window that does nothing but host a Flutter view.
+class FlutterWindow : public Win32Window {
+ public:
+  // Creates a new FlutterWindow hosting a Flutter view running |project|.
+  explicit FlutterWindow(const flutter::DartProject& project);
+  virtual ~FlutterWindow();
+
+ protected:
+  // Win32Window:
+  bool OnCreate() override;
+  void OnDestroy() override;
+  LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam,
+                         LPARAM const lparam) noexcept override;
+
+ private:
+  // The project to run.
+  flutter::DartProject project_;
+
+  // The Flutter instance hosted by this window.
+  std::unique_ptr<flutter::FlutterViewController> flutter_controller_;
+};
+
+#endif  // RUNNER_FLUTTER_WINDOW_H_

filcnaplo/windows/runner/main.cpp

@@ -0,0 +1,43 @@
+#include <flutter/dart_project.h>
+#include <flutter/flutter_view_controller.h>
+#include <windows.h>
+
+#include "flutter_window.h"
+#include "utils.h"
+
+int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
+                      _In_ wchar_t *command_line, _In_ int show_command) {
+  // Attach to console when present (e.g., 'flutter run') or create a
+  // new console when running with a debugger.
+  if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) {
+    CreateAndAttachConsole();
+  }
+
+  // Initialize COM, so that it is available for use in the library and/or
+  // plugins.
+  ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
+
+  flutter::DartProject project(L"data");
+
+  std::vector<std::string> command_line_arguments =
+      GetCommandLineArguments();
+
+  project.set_dart_entrypoint_arguments(std::move(command_line_arguments));
+
+  FlutterWindow window(project);
+  Win32Window::Point origin(10, 10);
+  Win32Window::Size size(800, 720);
+  if (!window.Create(L"reFilc", origin, size)) {
+    return EXIT_FAILURE;
+  }
+  window.SetQuitOnClose(true);
+
+  ::MSG msg;
+  while (::GetMessage(&msg, nullptr, 0, 0)) {
+    ::TranslateMessage(&msg);
+    ::DispatchMessage(&msg);
+  }
+
+  ::CoUninitialize();
+  return EXIT_SUCCESS;
+}

filcnaplo/windows/runner/resource.h

@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Runner.rc
+//
+#define IDI_APP_ICON                    101
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

filcnaplo/windows/runner/runner.exe.manifest

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 and Windows 11 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+    </application>
+  </compatibility>
+</assembly>

filcnaplo/windows/runner/utils.cpp

@@ -0,0 +1,65 @@
+#include "utils.h"
+
+#include <flutter_windows.h>
+#include <io.h>
+#include <stdio.h>
+#include <windows.h>
+
+#include <iostream>
+
+void CreateAndAttachConsole() {
+  if (::AllocConsole()) {
+    FILE *unused;
+    if (freopen_s(&unused, "CONOUT$", "w", stdout)) {
+      _dup2(_fileno(stdout), 1);
+    }
+    if (freopen_s(&unused, "CONOUT$", "w", stderr)) {
+      _dup2(_fileno(stdout), 2);
+    }
+    std::ios::sync_with_stdio();
+    FlutterDesktopResyncOutputStreams();
+  }
+}
+
+std::vector<std::string> GetCommandLineArguments() {
+  // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use.
+  int argc;
+  wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
+  if (argv == nullptr) {
+    return std::vector<std::string>();
+  }
+
+  std::vector<std::string> command_line_arguments;
+
+  // Skip the first argument as it's the binary name.
+  for (int i = 1; i < argc; i++) {
+    command_line_arguments.push_back(Utf8FromUtf16(argv[i]));
+  }
+
+  ::LocalFree(argv);
+
+  return command_line_arguments;
+}
+
+std::string Utf8FromUtf16(const wchar_t* utf16_string) {
+  if (utf16_string == nullptr) {
+    return std::string();
+  }
+  int target_length = ::WideCharToMultiByte(
+      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
+      -1, nullptr, 0, nullptr, nullptr)
+    -1; // remove the trailing null character
+  int input_length = (int)wcslen(utf16_string);
+  std::string utf8_string;
+  if (target_length <= 0 || target_length > utf8_string.max_size()) {
+    return utf8_string;
+  }
+  utf8_string.resize(target_length);
+  int converted_length = ::WideCharToMultiByte(
+      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
+      input_length, utf8_string.data(), target_length, nullptr, nullptr);
+  if (converted_length == 0) {
+    return std::string();
+  }
+  return utf8_string;
+}

filcnaplo/windows/runner/utils.h

@@ -0,0 +1,19 @@
+#ifndef RUNNER_UTILS_H_
+#define RUNNER_UTILS_H_
+
+#include <string>
+#include <vector>
+
+// Creates a console for the process, and redirects stdout and stderr to
+// it for both the runner and the Flutter library.
+void CreateAndAttachConsole();
+
+// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string
+// encoded in UTF-8. Returns an empty std::string on failure.
+std::string Utf8FromUtf16(const wchar_t* utf16_string);
+
+// Gets the command line arguments passed in as a std::vector<std::string>,
+// encoded in UTF-8. Returns an empty std::vector<std::string> on failure.
+std::vector<std::string> GetCommandLineArguments();
+
+#endif  // RUNNER_UTILS_H_

filcnaplo/windows/runner/win32_window.cpp

@@ -0,0 +1,288 @@
+#include "win32_window.h"
+
+#include <dwmapi.h>
+#include <flutter_windows.h>
+
+#include "resource.h"
+
+namespace {
+
+/// Window attribute that enables dark mode window decorations.
+///
+/// Redefined in case the developer's machine has a Windows SDK older than
+/// version 10.0.22000.0.
+/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute
+#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE
+#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
+#endif
+
+constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW";
+
+/// Registry key for app theme preference.
+///
+/// A value of 0 indicates apps should use dark mode. A non-zero or missing
+/// value indicates apps should use light mode.
+constexpr const wchar_t kGetPreferredBrightnessRegKey[] =
+  L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
+constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme";
+
+// The number of Win32Window objects that currently exist.
+static int g_active_window_count = 0;
+
+using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd);
+
+// Scale helper to convert logical scaler values to physical using passed in
+// scale factor
+int Scale(int source, double scale_factor) {
+  return static_cast<int>(source * scale_factor);
+}
+
+// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module.
+// This API is only needed for PerMonitor V1 awareness mode.
+void EnableFullDpiSupportIfAvailable(HWND hwnd) {
+  HMODULE user32_module = LoadLibraryA("User32.dll");
+  if (!user32_module) {
+    return;
+  }
+  auto enable_non_client_dpi_scaling =
+      reinterpret_cast<EnableNonClientDpiScaling*>(
+          GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
+  if (enable_non_client_dpi_scaling != nullptr) {
+    enable_non_client_dpi_scaling(hwnd);
+  }
+  FreeLibrary(user32_module);
+}
+
+}  // namespace
+
+// Manages the Win32Window's window class registration.
+class WindowClassRegistrar {
+ public:
+  ~WindowClassRegistrar() = default;
+
+  // Returns the singleton registrar instance.
+  static WindowClassRegistrar* GetInstance() {
+    if (!instance_) {
+      instance_ = new WindowClassRegistrar();
+    }
+    return instance_;
+  }
+
+  // Returns the name of the window class, registering the class if it hasn't
+  // previously been registered.
+  const wchar_t* GetWindowClass();
+
+  // Unregisters the window class. Should only be called if there are no
+  // instances of the window.
+  void UnregisterWindowClass();
+
+ private:
+  WindowClassRegistrar() = default;
+
+  static WindowClassRegistrar* instance_;
+
+  bool class_registered_ = false;
+};
+
+WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr;
+
+const wchar_t* WindowClassRegistrar::GetWindowClass() {
+  if (!class_registered_) {
+    WNDCLASS window_class{};
+    window_class.hCursor = LoadCursor(nullptr, IDC_ARROW);
+    window_class.lpszClassName = kWindowClassName;
+    window_class.style = CS_HREDRAW | CS_VREDRAW;
+    window_class.cbClsExtra = 0;
+    window_class.cbWndExtra = 0;
+    window_class.hInstance = GetModuleHandle(nullptr);
+    window_class.hIcon =
+        LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON));
+    window_class.hbrBackground = 0;
+    window_class.lpszMenuName = nullptr;
+    window_class.lpfnWndProc = Win32Window::WndProc;
+    RegisterClass(&window_class);
+    class_registered_ = true;
+  }
+  return kWindowClassName;
+}
+
+void WindowClassRegistrar::UnregisterWindowClass() {
+  UnregisterClass(kWindowClassName, nullptr);
+  class_registered_ = false;
+}
+
+Win32Window::Win32Window() {
+  ++g_active_window_count;
+}
+
+Win32Window::~Win32Window() {
+  --g_active_window_count;
+  Destroy();
+}
+
+bool Win32Window::Create(const std::wstring& title,
+                         const Point& origin,
+                         const Size& size) {
+  Destroy();
+
+  const wchar_t* window_class =
+      WindowClassRegistrar::GetInstance()->GetWindowClass();
+
+  const POINT target_point = {static_cast<LONG>(origin.x),
+                              static_cast<LONG>(origin.y)};
+  HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST);
+  UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
+  double scale_factor = dpi / 96.0;
+
+  HWND window = CreateWindow(
+      window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
+      Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
+      Scale(size.width, scale_factor), Scale(size.height, scale_factor),
+      nullptr, nullptr, GetModuleHandle(nullptr), this);
+
+  if (!window) {
+    return false;
+  }
+
+  UpdateTheme(window);
+
+  return OnCreate();
+}
+
+bool Win32Window::Show() {
+  return ShowWindow(window_handle_, SW_SHOWNORMAL);
+}
+
+// static
+LRESULT CALLBACK Win32Window::WndProc(HWND const window,
+                                      UINT const message,
+                                      WPARAM const wparam,
+                                      LPARAM const lparam) noexcept {
+  if (message == WM_NCCREATE) {
+    auto window_struct = reinterpret_cast<CREATESTRUCT*>(lparam);
+    SetWindowLongPtr(window, GWLP_USERDATA,
+                     reinterpret_cast<LONG_PTR>(window_struct->lpCreateParams));
+
+    auto that = static_cast<Win32Window*>(window_struct->lpCreateParams);
+    EnableFullDpiSupportIfAvailable(window);
+    that->window_handle_ = window;
+  } else if (Win32Window* that = GetThisFromHandle(window)) {
+    return that->MessageHandler(window, message, wparam, lparam);
+  }
+
+  return DefWindowProc(window, message, wparam, lparam);
+}
+
+LRESULT
+Win32Window::MessageHandler(HWND hwnd,
+                            UINT const message,
+                            WPARAM const wparam,
+                            LPARAM const lparam) noexcept {
+  switch (message) {
+    case WM_DESTROY:
+      window_handle_ = nullptr;
+      Destroy();
+      if (quit_on_close_) {
+        PostQuitMessage(0);
+      }
+      return 0;
+
+    case WM_DPICHANGED: {
+      auto newRectSize = reinterpret_cast<RECT*>(lparam);
+      LONG newWidth = newRectSize->right - newRectSize->left;
+      LONG newHeight = newRectSize->bottom - newRectSize->top;
+
+      SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth,
+                   newHeight, SWP_NOZORDER | SWP_NOACTIVATE);
+
+      return 0;
+    }
+    case WM_SIZE: {
+      RECT rect = GetClientArea();
+      if (child_content_ != nullptr) {
+        // Size and position the child window.
+        MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left,
+                   rect.bottom - rect.top, TRUE);
+      }
+      return 0;
+    }
+
+    case WM_ACTIVATE:
+      if (child_content_ != nullptr) {
+        SetFocus(child_content_);
+      }
+      return 0;
+
+    case WM_DWMCOLORIZATIONCOLORCHANGED:
+      UpdateTheme(hwnd);
+      return 0;
+  }
+
+  return DefWindowProc(window_handle_, message, wparam, lparam);
+}
+
+void Win32Window::Destroy() {
+  OnDestroy();
+
+  if (window_handle_) {
+    DestroyWindow(window_handle_);
+    window_handle_ = nullptr;
+  }
+  if (g_active_window_count == 0) {
+    WindowClassRegistrar::GetInstance()->UnregisterWindowClass();
+  }
+}
+
+Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept {
+  return reinterpret_cast<Win32Window*>(
+      GetWindowLongPtr(window, GWLP_USERDATA));
+}
+
+void Win32Window::SetChildContent(HWND content) {
+  child_content_ = content;
+  SetParent(content, window_handle_);
+  RECT frame = GetClientArea();
+
+  MoveWindow(content, frame.left, frame.top, frame.right - frame.left,
+             frame.bottom - frame.top, true);
+
+  SetFocus(child_content_);
+}
+
+RECT Win32Window::GetClientArea() {
+  RECT frame;
+  GetClientRect(window_handle_, &frame);
+  return frame;
+}
+
+HWND Win32Window::GetHandle() {
+  return window_handle_;
+}
+
+void Win32Window::SetQuitOnClose(bool quit_on_close) {
+  quit_on_close_ = quit_on_close;
+}
+
+bool Win32Window::OnCreate() {
+  // No-op; provided for subclasses.
+  return true;
+}
+
+void Win32Window::OnDestroy() {
+  // No-op; provided for subclasses.
+}
+
+void Win32Window::UpdateTheme(HWND const window) {
+  DWORD light_mode;
+  DWORD light_mode_size = sizeof(light_mode);
+  LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey,
+                               kGetPreferredBrightnessRegValue,
+                               RRF_RT_REG_DWORD, nullptr, &light_mode,
+                               &light_mode_size);
+
+  if (result == ERROR_SUCCESS) {
+    BOOL enable_dark_mode = light_mode == 0;
+    DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE,
+                          &enable_dark_mode, sizeof(enable_dark_mode));
+  }
+}

filcnaplo/windows/runner/win32_window.h

@@ -0,0 +1,102 @@
+#ifndef RUNNER_WIN32_WINDOW_H_
+#define RUNNER_WIN32_WINDOW_H_
+
+#include <windows.h>
+
+#include <functional>
+#include <memory>
+#include <string>
+
+// A class abstraction for a high DPI-aware Win32 Window. Intended to be
+// inherited from by classes that wish to specialize with custom
+// rendering and input handling
+class Win32Window {
+ public:
+  struct Point {
+    unsigned int x;
+    unsigned int y;
+    Point(unsigned int x, unsigned int y) : x(x), y(y) {}
+  };
+
+  struct Size {
+    unsigned int width;
+    unsigned int height;
+    Size(unsigned int width, unsigned int height)
+        : width(width), height(height) {}
+  };
+
+  Win32Window();
+  virtual ~Win32Window();
+
+  // Creates a win32 window with |title| that is positioned and sized using
+  // |origin| and |size|. New windows are created on the default monitor. Window
+  // sizes are specified to the OS in physical pixels, hence to ensure a
+  // consistent size this function will scale the inputted width and height as
+  // as appropriate for the default monitor. The window is invisible until
+  // |Show| is called. Returns true if the window was created successfully.
+  bool Create(const std::wstring& title, const Point& origin, const Size& size);
+
+  // Show the current window. Returns true if the window was successfully shown.
+  bool Show();
+
+  // Release OS resources associated with window.
+  void Destroy();
+
+  // Inserts |content| into the window tree.
+  void SetChildContent(HWND content);
+
+  // Returns the backing Window handle to enable clients to set icon and other
+  // window properties. Returns nullptr if the window has been destroyed.
+  HWND GetHandle();
+
+  // If true, closing this window will quit the application.
+  void SetQuitOnClose(bool quit_on_close);
+
+  // Return a RECT representing the bounds of the current client area.
+  RECT GetClientArea();
+
+ protected:
+  // Processes and route salient window messages for mouse handling,
+  // size change and DPI. Delegates handling of these to member overloads that
+  // inheriting classes can handle.
+  virtual LRESULT MessageHandler(HWND window,
+                                 UINT const message,
+                                 WPARAM const wparam,
+                                 LPARAM const lparam) noexcept;
+
+  // Called when CreateAndShow is called, allowing subclass window-related
+  // setup. Subclasses should return false if setup fails.
+  virtual bool OnCreate();
+
+  // Called when Destroy is called.
+  virtual void OnDestroy();
+
+ private:
+  friend class WindowClassRegistrar;
+
+  // OS callback called by message pump. Handles the WM_NCCREATE message which
+  // is passed when the non-client area is being created and enables automatic
+  // non-client DPI scaling so that the non-client area automatically
+  // responds to changes in DPI. All other messages are handled by
+  // MessageHandler.
+  static LRESULT CALLBACK WndProc(HWND const window,
+                                  UINT const message,
+                                  WPARAM const wparam,
+                                  LPARAM const lparam) noexcept;
+
+  // Retrieves a class instance pointer for |window|
+  static Win32Window* GetThisFromHandle(HWND const window) noexcept;
+
+  // Update the window frame's theme to match the system theme.
+  static void UpdateTheme(HWND const window);
+
+  bool quit_on_close_ = false;
+
+  // window handle for top level window.
+  HWND window_handle_ = nullptr;
+
+  // window handle for hosted content.
+  HWND child_content_ = nullptr;
+};
+
+#endif  // RUNNER_WIN32_WINDOW_H_

filcnaplo_desktop_ui/lib/pages/absences/absences_page.dart

@@ -35,7 +35,8 @@ class SubjectAbsence {
   List<Absence> absences;
   double percentage;
 
-  SubjectAbsence({required this.subject, this.absences = const [], this.percentage = 0.0});
+  SubjectAbsence(
+      {required this.subject, this.absences = const [], this.percentage = 0.0});
 }
 
 class AbsencesPage extends StatefulWidget {
@@ -45,7 +46,8 @@ class AbsencesPage extends StatefulWidget {
   _AbsencesPageState createState() => _AbsencesPageState();
 }
 
-class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMixin {
+class _AbsencesPageState extends State<AbsencesPage>
+    with TickerProviderStateMixin {
   late UserProvider user;
   late AbsenceProvider absenceProvider;
   late TimetableProvider timetableProvider;
@@ -65,7 +67,9 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
 
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
       for (final lesson in timetableProvider.getWeek(Week.current()) ?? []) {
-        if (!lesson.isEmpty && lesson.subject.id != '' && lesson.lessonYearIndex != null) {
+        if (!lesson.isEmpty &&
+            lesson.subject.id != '' &&
+            lesson.lessonYearIndex != null) {
           _lessonCount.update(
             lesson.subject,
             (value) {
@@ -89,25 +93,30 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
       if (absence.delay != 0) continue;
 
       if (!_absences.containsKey(absence.subject)) {
-        _absences[absence.subject] = SubjectAbsence(subject: absence.subject, absences: [absence]);
+        _absences[absence.subject] =
+            SubjectAbsence(subject: absence.subject, absences: [absence]);
       } else {
         _absences[absence.subject]?.absences.add(absence);
       }
     }
 
     _absences.forEach((subject, absence) {
-      final absentLessonsOfSubject = absenceProvider.absences.where((e) => e.subject == subject && e.delay == 0).length;
+      final absentLessonsOfSubject = absenceProvider.absences
+          .where((e) => e.subject == subject && e.delay == 0)
+          .length;
       final totalLessonsOfSubject = _lessonCount[subject]?.lessonYearIndex ?? 0;
 
       double absentLessonsOfSubjectPercentage;
 
       if (absentLessonsOfSubject <= totalLessonsOfSubject) {
-        absentLessonsOfSubjectPercentage = absentLessonsOfSubject / totalLessonsOfSubject * 100;
+        absentLessonsOfSubjectPercentage =
+            absentLessonsOfSubject / totalLessonsOfSubject * 100;
       } else {
         absentLessonsOfSubjectPercentage = -1;
       }
 
-      _absences[subject]?.percentage = absentLessonsOfSubjectPercentage.clamp(-1, 100.0);
+      _absences[subject]?.percentage =
+          absentLessonsOfSubjectPercentage.clamp(-1, 100.0);
     });
 
     absences = _absences.values.toList();
@@ -131,7 +140,8 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
       body: Padding(
         padding: const EdgeInsets.only(top: 12.0),
         child: NestedScrollView(
-          physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
+          physics: const BouncingScrollPhysics(
+              parent: AlwaysScrollableScrollPhysics()),
           headerSliverBuilder: (context, _) => [
             SliverAppBar(
               pinned: true,
@@ -145,7 +155,10 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
                 padding: const EdgeInsets.only(left: 8.0),
                 child: Text(
                   "Absences".i18n,
-                  style: TextStyle(color: AppColors.of(context).text, fontSize: 32.0, fontWeight: FontWeight.bold),
+                  style: TextStyle(
+                      color: AppColors.of(context).text,
+                      fontSize: 32.0,
+                      fontWeight: FontWeight.bold),
                 ),
               ),
               bottom: FilterBar(items: [
@@ -158,7 +171,8 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
           body: TabBarView(
               physics: const BouncingScrollPhysics(),
               controller: _tabController,
-              children: List.generate(3, (index) => filterViewBuilder(context, index))),
+              children: List.generate(
+                  3, (index) => filterViewBuilder(context, index))),
         ),
       ),
     );
@@ -174,10 +188,17 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
             widget: AbsenceSubjectTile(
               a.subject,
               percentage: a.percentage,
-              excused: a.absences.where((a) => a.state == Justification.excused).length,
-              unexcused: a.absences.where((a) => a.state == Justification.unexcused).length,
-              pending: a.absences.where((a) => a.state == Justification.pending).length,
-              onTap: () => AbsenceSubjectView.show(a.subject, a.absences, context: context),
+              excused: a.absences
+                  .where((a) => a.state == Justification.excused)
+                  .length,
+              unexcused: a.absences
+                  .where((a) => a.state == Justification.unexcused)
+                  .length,
+              pending: a.absences
+                  .where((a) => a.state == Justification.pending)
+                  .length,
+              onTap: () => AbsenceSubjectView.show(a.subject, a.absences,
+                  context: context),
             ),
           ));
         }
@@ -187,14 +208,17 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
           if (absence.delay != 0) {
             items.add(DateWidget(
                 date: absence.date,
-              widget: AbsenceViewable(absence, padding: EdgeInsets.zero),
-            ));
+                widget: AbsenceViewable(
+                  absence,
+                  padding: EdgeInsets.zero,
+                )));
           }
         }
         break;
       case AbsenceFilter.misses:
         for (var note in noteProvider.notes) {
-          if (note.type?.name == "HaziFeladatHiany" || note.type?.name == "Felszereleshiany") {
+          if (note.type?.name == "HaziFeladatHiany" ||
+              note.type?.name == "Felszereleshiany") {
             items.add(DateWidget(
               date: note.date,
               widget: MissTile(note),
@@ -232,10 +256,15 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
                       showDialog(
                         context: context,
                         builder: (context) => AlertDialog(
-                          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12.0)),
+                          shape: RoundedRectangleBorder(
+                              borderRadius: BorderRadius.circular(12.0)),
                           title: Text("attention".i18n),
                           content: Text("attention_body".i18n),
-                          actions: [ActionButton(label: "Ok", onTap: () => Navigator.of(context).pop())],
+                          actions: [
+                            ActionButton(
+                                label: "Ok",
+                                onTap: () => Navigator.of(context).pop())
+                          ],
                         ),
                       );
                     },
@@ -262,7 +291,10 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
                 );
               },
               child: Column(
-                children: getFilterWidgets(AbsenceFilter.values[activeData]).map((e) => e.widget).cast<Widget>().toList(),
+                children: getFilterWidgets(AbsenceFilter.values[activeData])
+                    .map((e) => e.widget)
+                    .cast<Widget>()
+                    .toList(),
               ),
             ),
           ),
@@ -284,7 +316,8 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
           itemCount: max(filterWidgets.length + (activeData <= 1 ? 1 : 0), 1),
           itemBuilder: (context, index) {
             if (filterWidgets.isNotEmpty) {
-              if ((index == 0 && activeData == 1) || (index == 0 && activeData == 0)) {
+              if ((index == 0 && activeData == 1) ||
+                  (index == 0 && activeData == 0)) {
                 int value1 = 0;
                 int value2 = 0;
                 String title1 = "";
@@ -292,18 +325,26 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
                 String suffix = "";
 
                 if (activeData == AbsenceFilter.absences.index) {
-                  value1 = absenceProvider.absences.where((e) => e.delay == 0 && e.state == Justification.excused).length;
-                  value2 = absenceProvider.absences.where((e) => e.delay == 0 && e.state == Justification.unexcused).length;
+                  value1 = absenceProvider.absences
+                      .where((e) =>
+                          e.delay == 0 && e.state == Justification.excused)
+                      .length;
+                  value2 = absenceProvider.absences
+                      .where((e) =>
+                          e.delay == 0 && e.state == Justification.unexcused)
+                      .length;
                   title1 = "stat_1".i18n;
                   title2 = "stat_2".i18n;
                   suffix = " " + "hr".i18n;
                 } else if (activeData == AbsenceFilter.delays.index) {
                   value1 = absenceProvider.absences
-                      .where((e) => e.delay != 0 && e.state == Justification.excused)
+                      .where((e) =>
+                          e.delay != 0 && e.state == Justification.excused)
                       .map((e) => e.delay)
                       .fold(0, (a, b) => a + b);
                   value2 = absenceProvider.absences
-                      .where((e) => e.delay != 0 && e.state == Justification.unexcused)
+                      .where((e) =>
+                          e.delay != 0 && e.state == Justification.unexcused)
                       .map((e) => e.delay)
                       .fold(0, (a, b) => a + b);
                   title1 = "stat_3".i18n;
@@ -312,7 +353,8 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
                 }
 
                 return Padding(
-                  padding: const EdgeInsets.only(bottom: 24.0, left: 24.0, right: 24.0),
+                  padding: const EdgeInsets.only(
+                      bottom: 24.0, left: 24.0, right: 24.0),
                   child: Row(children: [
                     Expanded(
                       child: StatisticsTile(
@@ -348,7 +390,8 @@ class _AbsencesPageState extends State<AbsencesPage> with TickerProviderStateMix
               }
 
               return Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 6.0),
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 24.0, vertical: 6.0),
                 child: filterWidgets[index - (activeData <= 1 ? 1 : 0)],
               );
             } else {

filcnaplo_desktop_ui/lib/pages/home/home_page.dart

@@ -1,7 +1,7 @@
 import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/ui/date_widget.dart';
-import 'package:filcnaplo_desktop_ui/common/filter_bar.dart';
+import 'package:filcnaplo_mobile_ui/common/filter_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:animated_list_plus/animated_list_plus.dart';
 import 'package:provider/provider.dart';
@@ -16,7 +16,8 @@ class HomePage extends StatefulWidget {
   State<HomePage> createState() => _HomePageState();
 }
 
-class _HomePageState extends State<HomePage> with SingleTickerProviderStateMixin {
+class _HomePageState extends State<HomePage>
+    with SingleTickerProviderStateMixin {
   late UserProvider user;
   late SettingsProvider settings;
 
@@ -41,11 +42,15 @@ class _HomePageState extends State<HomePage> with SingleTickerProviderStateMixin
     user = Provider.of<UserProvider>(context, listen: false);
 
     DateTime now = DateTime.now();
-    if (now.isBefore(DateTime(now.year, DateTime.august, 31)) && now.isAfter(DateTime(now.year, DateTime.june, 14))) {
+    if (now.isBefore(DateTime(now.year, DateTime.august, 31)) &&
+        now.isAfter(DateTime(now.year, DateTime.june, 14))) {
       greeting = "goodrest";
-    } else if (now.month == user.student?.birth.month && now.day == user.student?.birth.day) {
+    } else if (now.month == user.student?.birth.month &&
+        now.day == user.student?.birth.day) {
       greeting = "happybirthday";
-    } else if (now.month == DateTime.december && now.day >= 24 && now.day <= 26) {
+    } else if (now.month == DateTime.december &&
+        now.day >= 24 &&
+        now.day <= 26) {
       greeting = "merryxmas";
     } else if (now.month == DateTime.january && now.day == 1) {
       greeting = "happynewyear";
@@ -81,7 +86,8 @@ class _HomePageState extends State<HomePage> with SingleTickerProviderStateMixin
               children: [
                 // Greeting
                 Padding(
-                  padding: const EdgeInsets.only(left: 32.0, top: 24.0, bottom: 12.0),
+                  padding: const EdgeInsets.only(
+                      left: 32.0, top: 24.0, bottom: 12.0),
                   child: Text(
                     greeting.i18n.fill([firstName]),
                     overflow: TextOverflow.fade,
@@ -107,8 +113,10 @@ class _HomePageState extends State<HomePage> with SingleTickerProviderStateMixin
                       int selectedPage = _pageController.page!.round();
 
                       if (i == selectedPage) return;
-                      if (_pageController.page?.roundToDouble() != _pageController.page) {
-                        _pageController.animateToPage(i, curve: Curves.easeIn, duration: kTabScrollDuration);
+                      if (_pageController.page?.roundToDouble() !=
+                          _pageController.page) {
+                        _pageController.animateToPage(i,
+                            curve: Curves.easeIn, duration: kTabScrollDuration);
                         return;
                       }
 
@@ -132,27 +140,34 @@ class _HomePageState extends State<HomePage> with SingleTickerProviderStateMixin
                       (BuildContext context, int index) {
                         return FutureBuilder<List<DateWidget>>(
                           key: ValueKey<String>(listOrder[index]),
-                          future: getFilterWidgets(homeFilters[index], context: context),
-                          builder: (context, dateWidgets) => dateWidgets.data != null
+                          future: getFilterWidgets(homeFilters[index],
+                              context: context),
+                          builder: (context, dateWidgets) => dateWidgets.data !=
+                                  null
                               ? ImplicitlyAnimatedList<Widget>(
-                                  items: sortDateWidgets(context, dateWidgets: dateWidgets.data!),
+                                  items: sortDateWidgets(context,
+                                      dateWidgets: dateWidgets.data!),
                                   itemBuilder: filterItemBuilder,
                                   spawnIsolate: false,
                                   areItemsTheSame: (a, b) => a.key == b.key,
-                                  physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
-                                  padding: const EdgeInsets.symmetric(horizontal: 24.0),
+                                  physics: const BouncingScrollPhysics(
+                                      parent: AlwaysScrollableScrollPhysics()),
+                                  padding: const EdgeInsets.symmetric(
+                                      horizontal: 24.0),
                                 )
                               : Container(),
                         );
                       },
                       childCount: 4,
                       findChildIndexCallback: (Key key) {
-                        final ValueKey<String> valueKey = key as ValueKey<String>;
+                        final ValueKey<String> valueKey =
+                            key as ValueKey<String>;
                         final String data = valueKey.value;
                         return listOrder.indexOf(data);
                       },
                     ),
-                    physics: const PageScrollPhysics().applyTo(const BouncingScrollPhysics()),
+                    physics: const PageScrollPhysics()
+                        .applyTo(const BouncingScrollPhysics()),
                   ),
                 ),
               ],

filcnaplo_desktop_ui/lib/pages/timetable/timetable_page.dart

@@ -23,12 +23,14 @@ import 'timetable_page.i18n.dart';
 // todo: "fix" overflow (priority: -1)
 
 class TimetablePage extends StatefulWidget {
-  const TimetablePage({Key? key, this.initialDay, this.initialWeek}) : super(key: key);
+  const TimetablePage({Key? key, this.initialDay, this.initialWeek})
+      : super(key: key);
 
   final DateTime? initialDay;
   final Week? initialWeek;
 
-  static void jump(BuildContext context, {Week? week, DateTime? day, Lesson? lesson}) {
+  static void jump(BuildContext context,
+      {Week? week, DateTime? day, Lesson? lesson}) {
     // Go to timetable page with arguments
     // NavigationScreen.of(context)?.customRoute(navigationPageRoute((context) => TimetablePage(
     //       initialDay: lesson?.date ?? day,
@@ -49,7 +51,8 @@ class TimetablePage extends StatefulWidget {
   _TimetablePageState createState() => _TimetablePageState();
 }
 
-class _TimetablePageState extends State<TimetablePage> with TickerProviderStateMixin {
+class _TimetablePageState extends State<TimetablePage>
+    with TickerProviderStateMixin {
   late UserProvider user;
   late TimetableProvider timetableProvider;
   late UpdateProvider updateProvider;
@@ -60,7 +63,9 @@ class _TimetablePageState extends State<TimetablePage> with TickerProviderStateM
 
   int _getDayIndex(DateTime date) {
     int index = 0;
-    if (_controller.days == null || (_controller.days?.isEmpty ?? true)) return index;
+    if (_controller.days == null || (_controller.days?.isEmpty ?? true)) {
+      return index;
+    }
 
     // find the first day with upcoming lessons
     index = _controller.days!.indexWhere((day) => day.last.end.isAfter(date));
@@ -94,11 +99,14 @@ class _TimetablePageState extends State<TimetablePage> with TickerProviderStateM
         _tabController = TabController(
           length: _controller.days!.length,
           vsync: this,
-          initialIndex: min(_tabController.index, max(_controller.days!.length - 1, 0)),
+          initialIndex:
+              min(_tabController.index, max(_controller.days!.length - 1, 0)),
         );
 
-        if (initial || _controller.previousWeekId != _controller.currentWeekId) {
-          _tabController.animateTo(_getDayIndex(widget.initialDay ?? DateTime.now()));
+        if (initial ||
+            _controller.previousWeekId != _controller.currentWeekId) {
+          _tabController
+              .animateTo(_getDayIndex(widget.initialDay ?? DateTime.now()));
         }
         initial = false;
 
@@ -111,7 +119,8 @@ class _TimetablePageState extends State<TimetablePage> with TickerProviderStateM
       if (widget.initialWeek != null) {
         _controller.jump(widget.initialWeek!, context: context, initial: true);
       } else {
-        _controller.jump(_controller.currentWeek, context: context, initial: true, skip: true);
+        _controller.jump(_controller.currentWeek,
+            context: context, initial: true, skip: true);
       }
     }
     // Listen for user changes
@@ -131,7 +140,8 @@ class _TimetablePageState extends State<TimetablePage> with TickerProviderStateM
     // Sometimes when changing weeks really fast,
     // controller.days might be null or won't include index
     try {
-      return DateFormat("EEEE", I18n.of(context).locale.languageCode).format(_controller.days![index].first.date);
+      return DateFormat("EEEE", I18n.of(context).locale.languageCode)
+          .format(_controller.days![index].first.date);
     } catch (e) {
       return "timetable".i18n;
     }
@@ -181,9 +191,14 @@ class _TimetablePageState extends State<TimetablePage> with TickerProviderStateM
                                   children: [
                                     // Day Title
                                     Padding(
-                                      padding: const EdgeInsets.only(left: 24.0, right: 28.0, top: 18.0, bottom: 8.0),
+                                      padding: const EdgeInsets.only(
+                                          left: 24.0,
+                                          right: 28.0,
+                                          top: 18.0,
+                                          bottom: 8.0),
                                       child: Row(
-                                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.spaceBetween,
                                         children: [
                                           Text(
                                             dayTitle(tab).capital(),
@@ -193,9 +208,13 @@ class _TimetablePageState extends State<TimetablePage> with TickerProviderStateM
                                             ),
                                           ),
                                           Text(
-                                            "${_controller.days![tab].first.date.day}".padLeft(2, '0') + ".",
+                                            "${_controller.days![tab].first.date.day}"
+                                                    .padLeft(2, '0') +
+                                                ".",
                                             style: TextStyle(
-                                              color: AppColors.of(context).text.withOpacity(.5),
+                                              color: AppColors.of(context)
+                                                  .text
+                                                  .withOpacity(.5),
                                               fontWeight: FontWeight.w500,
                                             ),
                                           ),
@@ -208,35 +227,59 @@ class _TimetablePageState extends State<TimetablePage> with TickerProviderStateM
                                       child: ListView.builder(
                                         padding: EdgeInsets.zero,
                                         physics: const BouncingScrollPhysics(),
-                                        itemCount: _controller.days![tab].length + 2,
+                                        itemCount:
+                                            _controller.days![tab].length + 2,
                                         itemBuilder: (context, index) {
-                                          if (_controller.days == null) return Container();
+                                          if (_controller.days == null) {
+                                            return Container();
+                                          }
 
                                           // Header
                                           if (index == 0) {
                                             return const Padding(
-                                              padding: EdgeInsets.only(top: 8.0, left: 24.0, right: 24.0),
-                                              child: PanelHeader(padding: EdgeInsets.only(top: 12.0)),
+                                              padding: EdgeInsets.only(
+                                                  top: 8.0,
+                                                  left: 24.0,
+                                                  right: 24.0),
+                                              child: PanelHeader(
+                                                  padding: EdgeInsets.only(
+                                                      top: 12.0)),
                                             );
                                           }
 
                                           // Footer
-                                          if (index == _controller.days![tab].length + 1) {
+                                          if (index ==
+                                              _controller.days![tab].length +
+                                                  1) {
                                             return const Padding(
-                                              padding: EdgeInsets.only(bottom: 8.0, left: 24.0, right: 24.0),
-                                              child: PanelFooter(padding: EdgeInsets.only(top: 12.0)),
+                                              padding: EdgeInsets.only(
+                                                  bottom: 8.0,
+                                                  left: 24.0,
+                                                  right: 24.0),
+                                              child: PanelFooter(
+                                                  padding: EdgeInsets.only(
+                                                      top: 12.0)),
                                             );
                                           }
 
                                           // Body
-                                          final Lesson lesson = _controller.days![tab][index - 1];
-                                          final bool swapDescDay = _controller.days![tab].map((l) => l.swapDesc ? 1 : 0).reduce((a, b) => a + b) >=
-                                              _controller.days![tab].length * .5;
+                                          final Lesson lesson =
+                                              _controller.days![tab][index - 1];
+                                          final bool swapDescDay = _controller
+                                                  .days![tab]
+                                                  .map(
+                                                      (l) => l.swapDesc ? 1 : 0)
+                                                  .reduce((a, b) => a + b) >=
+                                              _controller.days![tab].length *
+                                                  .5;
 
                                           return Padding(
-                                            padding: const EdgeInsets.symmetric(horizontal: 24.0),
+                                            padding: const EdgeInsets.symmetric(
+                                                horizontal: 24.0),
                                             child: PanelBody(
-                                              padding: const EdgeInsets.symmetric(horizontal: 10.0),
+                                              padding:
+                                                  const EdgeInsets.symmetric(
+                                                      horizontal: 10.0),
                                               child: LessonViewable(
                                                 lesson,
                                                 swapDesc: swapDescDay,
@@ -264,7 +307,8 @@ class _TimetablePageState extends State<TimetablePage> with TickerProviderStateM
               ),
             ),
             Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
+              padding:
+                  const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
@@ -285,7 +329,10 @@ class _TimetablePageState extends State<TimetablePage> with TickerProviderStateM
                     onTap: () => setState(() {
                       _controller.current();
                       if (mounted) {
-                        _controller.jump(_controller.currentWeek, context: context, loader: _controller.currentWeekId != _controller.previousWeekId);
+                        _controller.jump(_controller.currentWeek,
+                            context: context,
+                            loader: _controller.currentWeekId !=
+                                _controller.previousWeekId);
                       }
                     }),
                     child: Padding(
@@ -295,12 +342,22 @@ class _TimetablePageState extends State<TimetablePage> with TickerProviderStateM
                             "week".i18n +
                             " (" +
                             // Week start
-                            DateFormat((_controller.currentWeek.start.year != DateTime.now().year ? "yy. " : "") + "MMM d.",
+                            DateFormat(
+                                    (_controller.currentWeek.start.year !=
+                                                DateTime.now().year
+                                            ? "yy. "
+                                            : "") +
+                                        "MMM d.",
                                     I18n.of(context).locale.languageCode)
                                 .format(_controller.currentWeek.start) +
                             " - " +
                             // Week end
-                            DateFormat((_controller.currentWeek.start.year != DateTime.now().year ? "yy. " : "") + "MMM d.",
+                            DateFormat(
+                                    (_controller.currentWeek.start.year !=
+                                                DateTime.now().year
+                                            ? "yy. "
+                                            : "") +
+                                        "MMM d.",
                                     I18n.of(context).locale.languageCode)
                                 .format(_controller.currentWeek.end) +
                             ")",

filcnaplo_desktop_ui/lib/screens/login/login_screen.dart

@@ -5,7 +5,6 @@ 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';
@@ -14,6 +13,17 @@ 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);
 
@@ -70,14 +80,20 @@ 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: SafeArea(
+      body: Container(
+        decoration: const BoxDecoration(
+          gradient: _backgroundGradient,
+        ),
+        child: SafeArea(
           child: Stack(
             children: [
               Row(
@@ -91,20 +107,27 @@ class _LoginScreenState extends State<LoginScreen> {
                           padding: const EdgeInsets.only(bottom: 24.0),
                           child: ClipRect(
                             child: Padding(
-                            padding: const EdgeInsets.only(left: 12.0, right: 12.0, bottom: 32.0),
+                              padding: const EdgeInsets.only(
+                                  left: 12.0, right: 12.0, bottom: 32.0),
                               child: SizedBox(
-                              width: 82.0,
-                              height: 82.0,
+                                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),
+                                      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"),
+                                      filter: ImageFilter.blur(
+                                          sigmaX: 6.0, sigmaY: 6.0),
+                                      child: Image.asset(
+                                          "assets/icons/ic_splash.png"),
                                     )
                                   ],
                                 ),
@@ -124,7 +147,8 @@ class _LoginScreenState extends State<LoginScreen> {
                                 Padding(
                                   padding: const EdgeInsets.only(bottom: 6.0),
                                   child: Row(
-                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                    mainAxisAlignment:
+                                        MainAxisAlignment.spaceBetween,
                                     children: [
                                       Expanded(
                                         child: Text(
@@ -164,7 +188,8 @@ class _LoginScreenState extends State<LoginScreen> {
                                 Padding(
                                   padding: const EdgeInsets.only(bottom: 6.0),
                                   child: Row(
-                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                    mainAxisAlignment:
+                                        MainAxisAlignment.spaceBetween,
                                     children: [
                                       Expanded(
                                         child: Text(
@@ -235,26 +260,36 @@ class _LoginScreenState extends State<LoginScreen> {
                                       fontWeight: FontWeight.w600,
                                       fontSize: 15.0,
                                     )),
-                              onPressed: () => _loginApi(context: context),
+                                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),
+                                    valueColor: AlwaysStoppedAnimation<Color>(
+                                        Colors.white),
                                   ),
                                 ),
                               ),
                             ),
                           ),
                         ),
-                      if (_loginState == LoginState.missingFields || _loginState == LoginState.invalidGrant || _loginState == LoginState.failed)
+                        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),
+                              [
+                                "missing_fields",
+                                "invalid_grant",
+                                "error"
+                              ][_loginState.index]
+                                  .i18n,
+                              style: const TextStyle(
+                                  color: Colors.red,
+                                  fontWeight: FontWeight.w500),
                             ),
                           ),
                       ],
@@ -276,20 +311,23 @@ class _LoginScreenState extends State<LoginScreen> {
             ],
           ),
         ),
+      ),
     );
   }
 
-  void _loginApi({required BuildContext context}) {
+  void _loginAPI({required BuildContext context}) {
     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);
     }
 
     setState(() => _loginState = LoginState.inProgress);
 
-    loginApi(
+    loginAPI(
         username: username,
         password: password,
         instituteCode: schoolController.selectedSchool!.instituteCode,
@@ -313,7 +351,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));
   }
 }