Merge pull request #50 from refilc/dev

Dev

.gitignore

@@ -1,5 +1,7 @@
 # See https://www.dartlang.org/guides/libraries/private-files
 
+.gitignore
+
 termek.txt
 .DS_Store
 filc3.properties
@@ -25,3 +27,26 @@ doc/api/
 *.js.map
 
 *.txt
+filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/connectivity_plus
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/dynamic_color
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/flutter_acrylic
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/path_provider_windows
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/permission_handler_windows
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/share_plus_windows
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/url_launcher_windows
+filcnaplo/windows/flutter/ephemeral/generated_config.cmake
+filcnaplo/windows/flutter/generated_plugin_registrant.cc
+filcnaplo/windows/flutter/generated_plugin_registrant.h
+filcnaplo/windows/flutter/generated_plugins.cmake
+filcnaplo/linux/flutter/generated_plugin_registrant.cc
+filcnaplo/linux/flutter/generated_plugin_registrant.h
+filcnaplo/linux/flutter/generated_plugins.cmake
+filcnaplo/macos/Flutter/*
+filcnaplo/ios/Podfile.lock
+.vscode/
+key.properties
+
+.flutter-plugins*
+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>

.idea/naplo.iml

@@ -2,7 +2,65 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_desktop_ui/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_desktop_ui/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_desktop_ui/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/dynamic_color/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_premium/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_premium/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_premium/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/share_plus/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_kreta_api/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_kreta_api/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_kreta_api/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_mobile_ui/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_mobile_ui/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo_mobile_ui/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/package_info_plus/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/build" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/.dart_tool" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

.vscode/launch.json

@@ -1,7 +1,4 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
     {
@@ -10,8 +7,34 @@
       "request": "launch",
       "type": "dart",
       "toolArgs": [
-        "--dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1) --release"
+        "--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",
+      "cwd": "filcnaplo",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "debug"
+    },
+    {
+      "name": "Flutter (release)",
+      "program": "lib/main.dart",
+      "cwd": "filcnaplo",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "release"
     }
   ]
 }

CONTRIBUTING.md

@@ -1,39 +1,36 @@
 
-# Contributing Guide
+# Contribution guide
 Köszönjük, ha programozással segíted a munkánkat!
-A folytatáshoz szükséged lesz egy Linuxot vagy Windowst futtató számítógépre, minimális programozási tapasztalatra és egy kis angoltudásra.
+A folytatáshoz szükséged lesz egy Linux-ot vagy Windows-t futtató számítógépre, minimális programozási tapasztalatra és egy kis angoltudásra.
-Segít, ha nem csak kicsit tudsz programozni, és ha ismered a Gitet és a GitHubot ;)
+Segít, ha már gyakorlottabb vagy a programozásban, és ha ismered a [Git](https://git-scm.com/) és a [GitHub](https://github.com/) működését. ;)
 
 ## Miben segítsek?
-Kérünk, **olyan dologgal járulj hozzá** a reFilchez, ami valószínűleg **sok embernek hasznos lesz** majd. Szeretnénk egy minél teljeskörűbb iskolai asszisztenst létrehozni, de az iskolaspecifikus, vagy külön neked hasznos funkciók helye inkább legyen a saját forkod.
+Kérünk, **olyan dologgal járulj hozzá** a **reFilc**hez, ami valószínűleg **sok embernek hasznos lehet**. Szeretnénk egy minél teljeskörűbb iskolai asszisztenst létrehozni, de az iskolaspecifikus, vagy külön neked hasznos funkciók helye inkább legyen a saját Fork-od.
 
-Fontos, hogy **mielőtt egy nagy volumenű projektbe belekezdesz, futtasd meg ötletedet a [Discord szerverünkön](https://dc.refilc.hu/),** ahol még azelőtt tudunk tanácsot adni, mielőtt sok-sok órát beleöltél volna egy esetleg felesleges dologba.
+Fontos, hogy **mielőtt egy nagyobb méretű projektbe belekezdenél, futtasd meg ötletedet a [Discord szerverünkön](https://dc.refilc.hu/)**, ahol még azelőtt tudunk tanácsot adni, hogy sok-sok órát beleöltél volna egy esetleg felesleges dologba.
 
-A legjobban annak örülünk, ha az [Issues](https://github.com/refilc/filcnaplo/issues) oldalról szemezgetsz, **ha lehet, a [priority taggel megjelöltekkel kezdd](https://github.com/refilc/filcnaplo/issues?q=is%3Aissue+is%3Aopen+label%3Apriority),** vagy ha új vagy a Flutterhez, ajánljuk figyelmedbe [ezeket a viszonylag könnyen javítható hibákat](https://github.com/refilc/filcnaplo/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) (ha épp van ilyen).
+A legjobban annak örülünk, ha az [Issues](https://github.com/refilc/naplo/issues) oldalról szemezgetsz. Ha még új vagy a Flutterben, ajánljuk figyelmedbe ezeket a [viszonylag könnyen javítható hibákat](https://github.com/refilc/naplo/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22), ha éppen van ilyen.
 
 ## Hogyan segítsek?
+Nem ígérhetünk itt sem programozás-, sem Git-kurzust, de a projektspecifikus dolgokat leírjuk, és segítünk a Flutter telepítésében.
 
-Nem ígérhetünk itt sem programozás-, sem git-kurzust, de a projektspecifikus dolgokat leírjuk, és segítünk a Flutter feltelepítésében.
+A **reFilc** a Google által pár éve létrehozott **[Flutter](https://flutter.dev/)** keretrendszert használja, aminek nyelve a **[Dart](https://dart.dev/)**. Ha ismered a C#, Java, C++, vagy egyéb hasonló programnyelvek működését, **nem fog nagy gondot okozni a használata.** A felhasználói felület létrehozásában az is segíthet, ha foglalkoztál már korábban weboldalakkal vagy alkalmazásfejlesztéssel.
+Ha még nem használtad a Flutter-t, mindenképp böngészd át a [YouTube csatornájukat](https://www.youtube.com/channel/UCwXdFgeE9KYzlDdR7TG9cMw).
+Kód vagy UI teszteléséhez Flutter telepítése nélkül is használhatod a [DartPad](https://dartpad.dev/)-et.
 
-A reFilc a Google által pár éve létrehozott **[Fluttert](https://flutter.dev/)** használja, aminek nyelve a **[Dart](https://dart.dev/)**. Ha ismered a C#-ot, Javát, C++t, vagy egyéb hasonló nyelvet, **nem fog gondot okozni a használata.** A felhasználói felület létrehozásában az is segíthet, ha foglalkoztál már korábban weboldalakkal.
+#### [Segítség a Flutter telepítéséhez](https://docs.flutter.dev/get-started/install)
-Ha még nem használtál Fluttert, mindenképp böngészd át a [YouTube csatornájukat](https://www.youtube.com/channel/UCwXdFgeE9KYzlDdR7TG9cMw).
+**Használd a Flutter stable verzióját!** Írd be a terminálba: `flutter channel stable`
-Könnyen tudsz kódot, vagy akár UI-t is tesztelni a [DartPad](https://dartpad.dev/) oldalon.
 
-#### [Segítség a Flutter telepítéséhez és a forráskód futtatásához](/.github/SETUP.md)
+Ha nem értessz a Git-hez vagy a GitHub-hoz, ajánljuk figyelmedbe [ezt a cikket](https://medium.com/envienta-magyarorsz%C3%A1g/git-%C3%A9s-github-gyorstalpal%C3%B3-f2d78a732deb), viszont arra kérünk, hogy a használatukat ne a **reFilc**en próbáld ki először. Hozz létre egy saját Repo-t és abban tesztelgess. Ha már nagyjából kitapasztaltad, várjuk hozzájárulásodat.
-Fontos: **Legyél a flutter beta verzióján!** Írd be: `flutter channel beta`
 
-
+Készíts egy Fork-ot a saját GitHub fiókod alá.
-
+A **reFilc** legfrissebb, **épp fejlesztés alatt álló verzióját a [master branch](https://github.com/refilc/naplo/tree/master)-en találod**. Kérjük ide Commit-olj és ide célozd a Fork-odból a Pull Request-edet. Írd le benne, hogy mit változtattál és ha lehet, csatolj képernyőképet is.
-Ha nem értesz a Githez, ajánljuk figyelmedbe [ezt a cikket](https://medium.com/envienta-magyarorsz%C3%A1g/git-%C3%A9s-github-gyorstalpal%C3%B3-f2d78a732deb). Viszont arra kérünk, a Git használatát ne a reFilcen próbáld ki először, hozz létre előbb egy saját Repót, és abba tesztelgess. Ha már nagyjából kitapasztaltad, várjuk hozzájárulásodat.
+Minél gyakrabban készíts minél részletesebben elnevezett Commit-okat, hogy mások is el tudjanak igazodni az általad beküldött kódban.
-
-Készíts egy forkot a saját fiókod alá.
-A reFilc legfrissebb, épp fejlesztés alatt álló verzióját a [dev brancen](https://github.com/refilc/filcnaplo/tree/dev) találod, kérjük ide commitolj, és ide célozd a forkodból a Pull Requested. Írd le benne, mit változtattál, és ha lehet, csatolj képernyőképet is.
-Minél gyakrabban készíts minél részletesebben elnevezett commitokat, hogy el tudjunk tájékozódni az általad beküldött kódon.
 
 ---
 
-Az általad fejlesztett funkciók mellé a changelogban odakerül GitHub felhasználóneved.
+Az általad fejlesztett funkciók mellé a Changelog-ba odakerül a GitHub felhasználóneved.
-Ha jelentős és rendszeres hozzájáruló vagy, Discordon megkapod a `DEV` rangot.
+Ha jelentős és rendszeres hozzájáruló vagy, Discord-on megkaphatod a `DEV` rangot.
 
-Ha bárhol elakadtál, keress minket Discordon.
+Ha bárhol elakadtál vagy kérdésed van, keress bátran Discordon!
-Jó fejlesztést kívánunk!
+**Jó fejlesztést kívánunk!**

LICENSE

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

README.md

@@ -1,18 +1,18 @@
 <p align=center>
-  <img src="https://media.discordapp.net/attachments/1111727410677825596/1111790518964326510/reFilc_Logo2.png?width=671&height=671" width=150>
+  <img src="https://media.discordapp.net/attachments/1111727410677825596/1113217167513624646/reFilc_Logo_Squircle.png?width=671&height=671" width=150>
   <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/latest/total?color=%23&label=Downloads&logo=github&sort=semver)](https://github.com/refilc/naplo/releases) &nbsp; [![discord](https://img.shields.io/discord/1111649116020285532?label=Discord)](http://dc.refilc.hu)
+[![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)
 
 ## Setup
 
 ### Clone the project
 
 ```sh
-git clone --recursive https://github.com/refilc/naplo
+git clone https://github.com/refilc/naplo
 cd naplo
 ```
 
@@ -27,12 +27,26 @@ cd filcnaplo
 flutter run
 ```
 
+### Contribution
+
+**Nézd meg a [Contribution guide](CONTRIBUTING.md)-ot!**
+
+Az összes (ugyan azon verzióhoz tartozó) contribution meg fog jelenni a release-nél. Kérjük, írd le a Discord nevedet a Description-be, hogy adhassunk rangot.
+
 -------
 
-# Kudo
+# Team
 
-**annon:** a Filc napló készítője (ez az app a Filcen alapul)
+**kima:** head developer / project manager
 
-**kima, chromium, peighter, mog, WolfY:** a fejlesztői csapat
+**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/.gitignore

@@ -44,3 +44,4 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+key.properties

filcnaplo/.metadata

@@ -1,30 +1,30 @@
-# This file tracks properties of this Flutter project.
+# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
+#
-# This file should be version controlled.
+# This file should be version controlled.
-
+
-version:
+version:
-  revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
+  revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-  channel: beta
+  channel: stable
-
+
-project_type: app
+project_type: app
-
+
-# Tracks metadata for the flutter migrate command
+# Tracks metadata for the flutter migrate command
-migration:
+migration:
-  platforms:
+  platforms:
-    - platform: root
+    - platform: root
-      create_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-      base_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-    - platform: macos
+    - platform: web
-      create_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
+      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-      base_revision: 3c0bee85b8e43b860877922bdc411a7333db4d32
+      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-
+
-  # User provided section
+  # User provided section
-
+
-  # List of Local paths (relative to this file) that should be
+  # List of Local paths (relative to this file) that should be
-  # ignored by the migrate tool.
+  # ignored by the migrate tool.
-  #
+  #
-  # Files that are not part of the templates will be ignored by default.
+  # Files that are not part of the templates will be ignored by default.
-  unmanaged_files:
+  unmanaged_files:
-    - 'lib/main.dart'
+    - 'lib/main.dart'
-    - 'ios/Runner.xcodeproj/project.pbxproj'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

filcnaplo/android/app/build.gradle

@@ -44,7 +44,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "hu.filc.naplo"
+        applicationId "hu.refilc.naplo"
         minSdkVersion 21
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode flutterVersionCode.toInteger()

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

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.filc.naplo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.refilc.naplo">
   <!-- Permissions -->
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.VIBRATE" />

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

@@ -1,13 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" package="hu.filc.naplo">
+    xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo">
-    <application android:label="reFilc" tools:replace="android:label" android:icon="@mipmap/ic_launcher"
+    <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:host="api.refilcapp.hu"
-                    android:pathPrefix="/callback" />
+                    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,14 +69,18 @@
             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" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-</manifest>
+</manifest>

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

@@ -1,18 +0,0 @@
-package hu.filc.naplo;
-
-import android.os.Bundle;
-
-import io.flutter.embedding.android.FlutterActivity;
-import io.flutter.plugins.GeneratedPluginRegistrant;
-
-import io.flutter.embedding.engine.FlutterEngine;
-
-public class MainActivity extends FlutterActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        GeneratedPluginRegistrant.registerWith(new FlutterEngine(this));
-    }
-}

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

@@ -0,0 +1,7 @@
+package hu.refilc.naplo;
+
+import io.flutter.embedding.android.FlutterActivity;
+
+public class MainActivity extends FlutterActivity {
+    
+}

filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/DBManager.java

@@ -1,119 +1,119 @@
-package hu.filc.naplo.database;
+package hu.refilc.naplo.database;
-
+
-import android.content.ContentValues;
+import android.content.ContentValues;
-import android.content.Context;
+import android.content.Context;
-import android.database.Cursor;
+import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteDatabase;
-
+
-import java.sql.SQLException;
+import java.sql.SQLException;
-
+
-import hu.filc.naplo.database.SQLiteHelper;
+import hu.refilc.naplo.database.SQLiteHelper;
-
+
-public class DBManager {
+public class DBManager {
-    private Context context;
+    private Context context;
-    private SQLiteDatabase database;
+    private SQLiteDatabase database;
-    private SQLiteHelper dbHelper;
+    private SQLiteHelper dbHelper;
-
+
-    public DBManager(Context c) {
+    public DBManager(Context c) {
-        this.context = c;
+        this.context = c;
-    }
+    }
-
+
-    public DBManager open() throws SQLException {
+    public DBManager open() throws SQLException {
-        this.dbHelper = new SQLiteHelper(this.context);
+        this.dbHelper = new SQLiteHelper(this.context);
-        this.database = this.dbHelper.getWritableDatabase();
+        this.database = this.dbHelper.getWritableDatabase();
-        return this;
+        return this;
-    }
+    }
-
+
-    public void close() {
+    public void close() {
-        this.dbHelper.close();
+        this.dbHelper.close();
-    }
+    }
-
+
-    public Cursor fetchWidget(int wid) {
+    public Cursor fetchWidget(int wid) {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_WIDGETS, new String[]{SQLiteHelper._ID, SQLiteHelper.DAY_SEL}, SQLiteHelper._ID + " = " + wid, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_WIDGETS, new String[]{SQLiteHelper._ID, SQLiteHelper.DAY_SEL}, SQLiteHelper._ID + " = " + wid, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchTimetable() {
+    public Cursor fetchTimetable() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_USER_DATA, new String[]{SQLiteHelper.TIMETABLE}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_USER_DATA, new String[]{SQLiteHelper.TIMETABLE}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchLastUser() {
+    public Cursor fetchLastUser() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.LAST_ACCOUNT_ID}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.LAST_ACCOUNT_ID}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchTheme() {
+    public Cursor fetchTheme() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.THEME, SQLiteHelper.ACCENT_COLOR}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.THEME, SQLiteHelper.ACCENT_COLOR}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchPremiumToken() {
+    public Cursor fetchPremiumToken() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.PREMIUM_TOKEN}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.PREMIUM_TOKEN}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchPremiumScopes() {
+    public Cursor fetchPremiumScopes() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.PREMIUM_SCOPES}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.PREMIUM_SCOPES}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public Cursor fetchLocale() {
+    public Cursor fetchLocale() {
-        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.LOCALE}, null, null, null, null, null);
+        Cursor cursor = this.database.query(SQLiteHelper.TABLE_NAME_SETTINGS, new String[]{SQLiteHelper.LOCALE}, null, null, null, null, null);
-        if (cursor != null) {
+        if (cursor != null) {
-            cursor.moveToFirst();
+            cursor.moveToFirst();
-        }
+        }
-        return cursor;
+        return cursor;
-    }
+    }
-
+
-    public void deleteWidget(int _id) {
+    public void deleteWidget(int _id) {
-        this.database.delete(SQLiteHelper.TABLE_NAME_WIDGETS, "_id=" + _id, null);
+        this.database.delete(SQLiteHelper.TABLE_NAME_WIDGETS, "_id=" + _id, null);
-    }
+    }
-
+
-    /*public void changeSettings(int _id, Map<String, String> map) {
+    /*public void changeSettings(int _id, Map<String, String> map) {
-        ContentValues con = new ContentValues();
+        ContentValues con = new ContentValues();
-        for(Map.Entry<String, String> e: map.entrySet()){
+        for(Map.Entry<String, String> e: map.entrySet()){
-            con.put(e.getKey(), e.getValue());
+            con.put(e.getKey(), e.getValue());
-        }
+        }
-        this.database.update(SQLiteHelper.TABLE_NAME_WIDGETS, con, "_id = " + _id, null);
+        this.database.update(SQLiteHelper.TABLE_NAME_WIDGETS, con, "_id = " + _id, null);
-    }
+    }
-    public void insertSettings(int _id, Map<String, String> map) {
+    public void insertSettings(int _id, Map<String, String> map) {
-        ContentValues con = new ContentValues();
+        ContentValues con = new ContentValues();
-        for(Map.Entry<String, String> e: map.entrySet()){
+        for(Map.Entry<String, String> e: map.entrySet()){
-            con.put(e.getKey(), e.getValue());
+            con.put(e.getKey(), e.getValue());
-            //Log.d("Settings added", e.getKey() + " - " + e.getValue());
+            //Log.d("Settings added", e.getKey() + " - " + e.getValue());
-        }
+        }
-        this.database.insert(SQLiteHelper.TABLE_NAME_WIDGETS, null, con);
+        this.database.insert(SQLiteHelper.TABLE_NAME_WIDGETS, null, con);
-    }*/
+    }*/
-
+
-    public void insertSelDay(int _id, int day_sel) {
+    public void insertSelDay(int _id, int day_sel) {
-        ContentValues con = new ContentValues();
+        ContentValues con = new ContentValues();
-        con.put(SQLiteHelper._ID, _id);
+        con.put(SQLiteHelper._ID, _id);
-        con.put(SQLiteHelper.DAY_SEL, day_sel);
+        con.put(SQLiteHelper.DAY_SEL, day_sel);
-        this.database.insert(SQLiteHelper.TABLE_NAME_WIDGETS, null, con);
+        this.database.insert(SQLiteHelper.TABLE_NAME_WIDGETS, null, con);
-    }
+    }
-
+
-    public int update(int _id, int day_sel) {
+    public int update(int _id, int day_sel) {
-        ContentValues con = new ContentValues();
+        ContentValues con = new ContentValues();
-        con.put(SQLiteHelper.DAY_SEL, day_sel);
+        con.put(SQLiteHelper.DAY_SEL, day_sel);
-        return this.database.update(SQLiteHelper.TABLE_NAME_WIDGETS, con, SQLiteHelper._ID + " = " + _id, null);
+        return this.database.update(SQLiteHelper.TABLE_NAME_WIDGETS, con, SQLiteHelper._ID + " = " + _id, null);
-    }
+    }
 }

filcnaplo/android/app/src/main/java/hu/refilc/naplo/database/SQLiteHelper.java

@@ -1,36 +1,36 @@
-package hu.filc.naplo.database;
+package hu.refilc.naplo.database;
-
+
-import android.content.Context;
+import android.content.Context;
-import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteOpenHelper;
-
+
-public class SQLiteHelper extends SQLiteOpenHelper {
+public class SQLiteHelper extends SQLiteOpenHelper {
-    private static final String CREATE_TABLE_WIDGET = " create table widgets ( _id INTEGER NOT NULL, day_sel INTEGER NOT NULL);";
+    private static final String CREATE_TABLE_WIDGET = " create table widgets ( _id INTEGER NOT NULL, day_sel INTEGER NOT NULL);";
-    private static final String DB_NAME = "app.db";
+    private static final String DB_NAME = "app.db";
-    private static final int DB_VERSION = 1;
+    private static final int DB_VERSION = 1;
-    public static final String _ID = "_id";
+    public static final String _ID = "_id";
-    public static final String DAY_SEL = "day_sel";
+    public static final String DAY_SEL = "day_sel";
-    public static final String TIMETABLE = "timetable";
+    public static final String TIMETABLE = "timetable";
-    public static final String LAST_ACCOUNT_ID = "last_account_id";
+    public static final String LAST_ACCOUNT_ID = "last_account_id";
-    public static final String THEME = "theme";
+    public static final String THEME = "theme";
-    public static final String PREMIUM_TOKEN = "premium_token";
+    public static final String PREMIUM_TOKEN = "premium_token";
-    public static final String PREMIUM_SCOPES = "premium_scopes";
+    public static final String PREMIUM_SCOPES = "premium_scopes";
-    public static final String LOCALE = "language";
+    public static final String LOCALE = "language";
-    public static final String ACCENT_COLOR = "accent_color";
+    public static final String ACCENT_COLOR = "accent_color";
-    public static final String TABLE_NAME_WIDGETS = "widgets";
+    public static final String TABLE_NAME_WIDGETS = "widgets";
-    public static final String TABLE_NAME_USER_DATA = "user_data";
+    public static final String TABLE_NAME_USER_DATA = "user_data";
-    public static final String TABLE_NAME_SETTINGS = "settings";
+    public static final String TABLE_NAME_SETTINGS = "settings";
-
+
-    public SQLiteHelper(Context context) {
+    public SQLiteHelper(Context context) {
-        super(context, DB_NAME, null, 7);
+        super(context, DB_NAME, null, 7);
-    }
+    }
-
+
-    public void onCreate(SQLiteDatabase db) {
+    public void onCreate(SQLiteDatabase db) {
-        db.execSQL(CREATE_TABLE_WIDGET);
+        db.execSQL(CREATE_TABLE_WIDGET);
-    }
+    }
-
+
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        db.execSQL("DROP TABLE IF EXISTS widgets");
+        db.execSQL("DROP TABLE IF EXISTS widgets");
-        onCreate(db);
+        onCreate(db);
-    }
+    }
 }

filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Utils.java

@@ -1,36 +1,36 @@
-package hu.filc.naplo.utils;
+package hu.refilc.naplo.utils;
-
+
-import android.content.Context;
+import android.content.Context;
-import android.net.ConnectivityManager;
+import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
+import android.net.NetworkInfo;
-
+
-import java.util.Calendar;
+import java.util.Calendar;
-import java.util.Date;
+import java.util.Date;
-
+
-public class Utils {
+public class Utils {
-    public static boolean hasNetwork(Context context) {
+    public static boolean hasNetwork(Context context) {
-        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        NetworkInfo netInfo = cm.getActiveNetworkInfo();
+        NetworkInfo netInfo = cm.getActiveNetworkInfo();
-        if (netInfo != null && netInfo.isConnectedOrConnecting()) {
+        if (netInfo != null && netInfo.isConnectedOrConnecting()) {
-            return true;
+            return true;
-        }
+        }
-        return false;
+        return false;
-    }
+    }
-
+
-    public static Date getWeekStartDate() {
+    public static Date getWeekStartDate() {
-        Calendar calendar = Calendar.getInstance();
+        Calendar calendar = Calendar.getInstance();
-        while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
+        while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
-            calendar.add(Calendar.DATE, -1);
+            calendar.add(Calendar.DATE, -1);
-        }
+        }
-        return calendar.getTime();
+        return calendar.getTime();
-    }
+    }
-
+
-    public static Date getWeekEndDate() {
+    public static Date getWeekEndDate() {
-        Calendar calendar = Calendar.getInstance();
+        Calendar calendar = Calendar.getInstance();
-        while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
+        while (calendar.get(Calendar.DAY_OF_WEEK) != Calendar.MONDAY) {
-            calendar.add(Calendar.DATE, 1);
+            calendar.add(Calendar.DATE, 1);
-        }
+        }
-        calendar.add(Calendar.DATE, -1);
+        calendar.add(Calendar.DATE, -1);
-        return calendar.getTime();
+        return calendar.getTime();
-    }
+    }
-}
+}

filcnaplo/android/app/src/main/java/hu/refilc/naplo/utils/Week.java

@@ -1,65 +1,65 @@
-package hu.filc.naplo.utils;
+package hu.refilc.naplo.utils;
-
+
-import java.time.DayOfWeek;
+import java.time.DayOfWeek;
-import java.time.Duration;
+import java.time.Duration;
-import java.time.LocalDate;
+import java.time.LocalDate;
-
+
-public class Week {
+public class Week {
-    private final LocalDate start;
+    private final LocalDate start;
-    private final LocalDate end;
+    private final LocalDate end;
-
+
-    private Week(LocalDate start, LocalDate end) {
+    private Week(LocalDate start, LocalDate end) {
-        this.start = start;
+        this.start = start;
-        this.end = end;
+        this.end = end;
-    }
+    }
-
+
-    public static Week current() {
+    public static Week current() {
-        return fromDate(LocalDate.now());
+        return fromDate(LocalDate.now());
-    }
+    }
-
+
-    public static Week fromId(int id) {
+    public static Week fromId(int id) {
-        LocalDate _now = getYearStart().plusDays(id * 7L);
+        LocalDate _now = getYearStart().plusDays(id * 7L);
-        return new Week(_now.minusDays(_now.getDayOfWeek().getValue() - 1), _now.plusDays(7 - _now.getDayOfWeek().getValue()));
+        return new Week(_now.minusDays(_now.getDayOfWeek().getValue() - 1), _now.plusDays(7 - _now.getDayOfWeek().getValue()));
-    }
+    }
-
+
-    public static Week fromDate(LocalDate date) {
+    public static Week fromDate(LocalDate date) {
-
+
-        return new Week(date.minusDays(date.getDayOfWeek().getValue() - 1), date.plusDays(7 - date.getDayOfWeek().getValue()));
+        return new Week(date.minusDays(date.getDayOfWeek().getValue() - 1), date.plusDays(7 - date.getDayOfWeek().getValue()));
-    }
+    }
-
+
-    public Week next() {
+    public Week next() {
-        return Week.fromDate(start.plusDays(8));
+        return Week.fromDate(start.plusDays(8));
-    }
+    }
-
+
-    public int id() {
+    public int id() {
-        return (int) Math.ceil(Duration.between(getYearStart().atStartOfDay(), start.atStartOfDay()).toDays() / 7f);
+        return (int) Math.ceil(Duration.between(getYearStart().atStartOfDay(), start.atStartOfDay()).toDays() / 7f);
-    }
+    }
-
+
-    private static LocalDate getYearStart() {
+    private static LocalDate getYearStart() {
-        LocalDate now = LocalDate.now();
+        LocalDate now = LocalDate.now();
-        LocalDate start = getYearStart(now.getYear());
+        LocalDate start = getYearStart(now.getYear());
-        return start.isBefore(now) ? start : getYearStart(now.getYear() -1);
+        return start.isBefore(now) ? start : getYearStart(now.getYear() -1);
-    }
+    }
-
+
-    private static LocalDate getYearStart(int year) {
+    private static LocalDate getYearStart(int year) {
-        LocalDate time = LocalDate.of(year, 9, 1);
+        LocalDate time = LocalDate.of(year, 9, 1);
-        if (time.getDayOfWeek() == DayOfWeek.SATURDAY)
+        if (time.getDayOfWeek() == DayOfWeek.SATURDAY)
-            return time.plusDays(2);
+            return time.plusDays(2);
-        else if (time.getDayOfWeek() == DayOfWeek.SUNDAY)
+        else if (time.getDayOfWeek() == DayOfWeek.SUNDAY)
-            return time.plusDays(1);
+            return time.plusDays(1);
-        return time;
+        return time;
-    }
+    }
-
+
-    @Override
+    @Override
-    public boolean equals(Object o) {
+    public boolean equals(Object o) {
-        if (this == o) return true;
+        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (o == null || getClass() != o.getClass()) return false;
-        Week week = (Week) o;
+        Week week = (Week) o;
-        return this.id() == week.id();
+        return this.id() == week.id();
-    }
+    }
-
+
-    @Override
+    @Override
-    public int hashCode() {
+    public int hashCode() {
-        return id();
+        return id();
-    }
+    }
 }

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

@@ -1,397 +1,392 @@
-package hu.filc.naplo.widget_timetable;
+package hu.refilc.naplo.widget_timetable;
-
+
-import android.app.PendingIntent;
+import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
+import android.appwidget.AppWidgetProvider;
-import android.content.Context;
+import android.content.Context;
-import android.content.Intent;
+import android.content.Intent;
-import android.content.SharedPreferences;
+import android.content.SharedPreferences;
-import android.database.Cursor;
+import android.database.Cursor;
-import android.net.Uri;
+import android.net.Uri;
-import android.os.Build;
+import android.os.Build;
-import android.util.Log;
+import android.util.Log;
-import android.view.View;
+import android.view.View;
-import android.widget.RemoteViews;
+import android.widget.RemoteViews;
-import android.widget.Toast;
+import android.widget.Toast;
-
+
-import org.joda.time.DateTime;
+import org.joda.time.DateTime;
-import org.json.JSONArray;
+import org.json.JSONArray;
-import org.json.JSONException;
+import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.JSONObject;
-
+
-import java.time.DayOfWeek;
+import java.time.DayOfWeek;
-import java.time.format.TextStyle;
+import java.time.format.TextStyle;
-import java.util.ArrayList;
+import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collections;
-import java.util.Comparator;
+import java.util.Comparator;
-import java.util.List;
+import java.util.List;
-import java.util.Locale;
+import java.util.Locale;
-
+import java.util.Map;
-import hu.filc.naplo.database.DBManager;
+import java.util.HashMap;
-import hu.filc.naplo.MainActivity;
+import java.text.ParseException;
-import hu.filc.naplo.R;
+import java.text.SimpleDateFormat;
-
+import java.util.Date;
-import hu.filc.naplo.utils.Week;
+
-
+import hu.refilc.naplo.database.DBManager;
-import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
+import hu.refilc.naplo.MainActivity;
-
+import hu.refilc.naplo.R;
-import es.antonborri.home_widget.HomeWidgetBackgroundIntent;
+
-import es.antonborri.home_widget.HomeWidgetLaunchIntent;
+import hu.refilc.naplo.utils.Week;
-import es.antonborri.home_widget.HomeWidgetProvider;
+
-
+import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
-public class WidgetTimetable extends HomeWidgetProvider {
+
-
+import es.antonborri.home_widget.HomeWidgetBackgroundIntent;
-    private static final String ACTION_WIDGET_CLICK_NAV_LEFT = "list_widget.ACTION_WIDGET_CLICK_NAV_LEFT";
+import es.antonborri.home_widget.HomeWidgetLaunchIntent;
-    private static final String ACTION_WIDGET_CLICK_NAV_RIGHT = "list_widget.ACTION_WIDGET_CLICK_NAV_RIGHT";
+import es.antonborri.home_widget.HomeWidgetProvider;
-    private static final String ACTION_WIDGET_CLICK_NAV_TODAY = "list_widget.ACTION_WIDGET_CLICK_NAV_TODAY";
+
-    private static final String ACTION_WIDGET_CLICK_NAV_REFRESH = "list_widget.ACTION_WIDGET_CLICK_NAV_REFRESH";
+public class WidgetTimetable extends HomeWidgetProvider {
-    private static final String ACTION_WIDGET_CLICK_BUY_PREMIUM = "list_widget.ACTION_WIDGET_CLICK_BUY_PREMIUM";
+
-
+    private static final String ACTION_WIDGET_CLICK_NAV_LEFT = "list_widget.ACTION_WIDGET_CLICK_NAV_LEFT";
-    @Override
+    private static final String ACTION_WIDGET_CLICK_NAV_RIGHT = "list_widget.ACTION_WIDGET_CLICK_NAV_RIGHT";
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, SharedPreferences widgetData) {
+    private static final String ACTION_WIDGET_CLICK_NAV_TODAY = "list_widget.ACTION_WIDGET_CLICK_NAV_TODAY";
-        for (int i = 0; i < appWidgetIds.length; i++) {
+    private static final String ACTION_WIDGET_CLICK_NAV_REFRESH = "list_widget.ACTION_WIDGET_CLICK_NAV_REFRESH";
-            RemoteViews views = generateView(context, appWidgetIds[i]);
+    private static final String ACTION_WIDGET_CLICK_BUY_PREMIUM = "list_widget.ACTION_WIDGET_CLICK_BUY_PREMIUM";
-
+
-            if(premiumEnabled(context) && userLoggedIn(context)) {
+    @Override
-                int rday = selectDay(context, appWidgetIds[i], 0, true);
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, SharedPreferences widgetData) {
-                views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
+        for (int i = 0; i < appWidgetIds.length; i++) {
-            }
+            RemoteViews views = generateView(context, appWidgetIds[i]);
-
+
-            pushUpdate(context, views, appWidgetIds[i]);
+            if(premiumEnabled(context) && userLoggedIn(context)) {
-        }
+                int rday = selectDay(context, appWidgetIds[i], 0, true);
-    }
+                views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
-
+            }
-    public static void pushUpdate(Context context, RemoteViews remoteViews, int appWidgetSingleId) {
+
-        AppWidgetManager manager = AppWidgetManager.getInstance(context);
+            pushUpdate(context, views, appWidgetIds[i]);
-
+        }
-        manager.updateAppWidget(appWidgetSingleId, remoteViews);
+    }
-        manager.notifyAppWidgetViewDataChanged(appWidgetSingleId, R.id.widget_list);
+
-    }
+    public static void pushUpdate(Context context, RemoteViews remoteViews, int appWidgetSingleId) {
-
+        AppWidgetManager manager = AppWidgetManager.getInstance(context);
-    public static RemoteViews generateView(Context context, int appId) {
+
-        Intent serviceIntent = new Intent(context, WidgetTimetableService.class);
+        manager.updateAppWidget(appWidgetSingleId, remoteViews);
-        serviceIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appId);
+        manager.notifyAppWidgetViewDataChanged(appWidgetSingleId, R.id.widget_list);
-        serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME)));
+    }
-
+
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_timetable);
+    public static RemoteViews generateView(Context context, int appId) {
-
+        Intent serviceIntent = new Intent(context, WidgetTimetableService.class);
-        views.setViewVisibility(R.id.need_premium, View.GONE);
+        serviceIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appId);
-        views.setViewVisibility(R.id.need_login, View.GONE);
+        serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME)));
-        views.setViewVisibility(R.id.tt_grid_cont, View.GONE);
+
-
+        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_timetable);
-        if(!userLoggedIn(context)) {
+
-            views.setViewVisibility(R.id.need_login, View.VISIBLE);
+        views.setViewVisibility(R.id.need_premium, View.GONE);
-            views.setOnClickPendingIntent(R.id.open_login, makePending(context, ACTION_WIDGET_CLICK_BUY_PREMIUM, appId));
+        views.setViewVisibility(R.id.need_login, View.GONE);
-        } else if(premiumEnabled(context)) {
+        views.setViewVisibility(R.id.tt_grid_cont, View.GONE);
-            views.setViewVisibility(R.id.tt_grid_cont, View.VISIBLE);
+
-            views.setOnClickPendingIntent(R.id.nav_to_left, makePending(context, ACTION_WIDGET_CLICK_NAV_LEFT, appId));
+        if(!userLoggedIn(context)) {
-            views.setOnClickPendingIntent(R.id.nav_to_right, makePending(context, ACTION_WIDGET_CLICK_NAV_RIGHT, appId));
+            views.setViewVisibility(R.id.need_login, View.VISIBLE);
-            views.setOnClickPendingIntent(R.id.nav_current, makePending(context, ACTION_WIDGET_CLICK_NAV_TODAY, appId));
+            views.setOnClickPendingIntent(R.id.open_login, makePending(context, ACTION_WIDGET_CLICK_BUY_PREMIUM, appId));
-            views.setOnClickPendingIntent(R.id.nav_refresh, makePending(context, ACTION_WIDGET_CLICK_NAV_REFRESH, appId));
+        } else if(premiumEnabled(context)) {
-            views.setRemoteAdapter(R.id.widget_list, serviceIntent);
+            views.setViewVisibility(R.id.tt_grid_cont, View.VISIBLE);
-            views.setEmptyView(R.id.widget_list, R.id.empty_view);
+            views.setOnClickPendingIntent(R.id.nav_to_left, makePending(context, ACTION_WIDGET_CLICK_NAV_LEFT, appId));
-        } else  {
+            views.setOnClickPendingIntent(R.id.nav_to_right, makePending(context, ACTION_WIDGET_CLICK_NAV_RIGHT, appId));
-            views.setViewVisibility(R.id.need_premium, View.VISIBLE);
+            views.setOnClickPendingIntent(R.id.nav_current, makePending(context, ACTION_WIDGET_CLICK_NAV_TODAY, appId));
-            views.setOnClickPendingIntent(R.id.buy_premium, makePending(context, ACTION_WIDGET_CLICK_BUY_PREMIUM, appId));
+            views.setOnClickPendingIntent(R.id.nav_refresh, makePending(context, ACTION_WIDGET_CLICK_NAV_REFRESH, appId));
-        }
+            views.setRemoteAdapter(R.id.widget_list, serviceIntent);
-
+            views.setEmptyView(R.id.widget_list, R.id.empty_view);
-        return views;
+        } else  {
-    }
+            views.setViewVisibility(R.id.need_premium, View.VISIBLE);
-
+            views.setOnClickPendingIntent(R.id.buy_premium, makePending(context, ACTION_WIDGET_CLICK_BUY_PREMIUM, appId));
-    static PendingIntent makePending(Context context, String action, int appWidgetId) {
+        }
-        Intent activebtnnext = new Intent(context, WidgetTimetable.class);
+
-        activebtnnext.setAction(action);
+        return views;
-        activebtnnext.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+    }
-        return PendingIntent.getBroadcast(context, appWidgetId, activebtnnext , PendingIntent.FLAG_IMMUTABLE);
+
-    }
+    static PendingIntent makePending(Context context, String action, int appWidgetId) {
-
+        Intent activebtnnext = new Intent(context, WidgetTimetable.class);
-    @Override
+        activebtnnext.setAction(action);
-    public void onReceive(Context context, Intent intent) {
+        activebtnnext.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-        super.onReceive(context, intent);
+        return PendingIntent.getBroadcast(context, appWidgetId, activebtnnext , PendingIntent.FLAG_IMMUTABLE);
-
+    }
-        if(intent.hasExtra(AppWidgetManager.EXTRA_APPWIDGET_ID)) {
+
-            int appId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+    @Override
-            RemoteViews views = generateView(context, appId);
+    public void onReceive(Context context, Intent intent) {
-
+        super.onReceive(context, intent);
-            try {
+
-                if(premiumEnabled(context) && userLoggedIn(context)) {
+        if(intent.hasExtra(AppWidgetManager.EXTRA_APPWIDGET_ID)) {
-                    if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_LEFT)) {
+            int appId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
-                        int rday = selectDay(context, appId, -1, false);
+            RemoteViews views = generateView(context, appId);
-                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
+
-
+            try {
-                        pushUpdate(context, views, appId);
+                if(premiumEnabled(context) && userLoggedIn(context)) {
-                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_RIGHT)) {
+                    if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_LEFT)) {
-                        int rday = selectDay(context, appId, 1, false);
+                        int rday = selectDay(context, appId, -1, false);
-                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
+                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
-
+
-                        pushUpdate(context, views, appId);
+                        pushUpdate(context, views, appId);
-                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_TODAY)) {
+                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_RIGHT)) {
-                        int rday = getToday(context);
+                        int rday = selectDay(context, appId, 1, false);
-                        setSelectedDay(context, appId, rday);
+                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
-
+
-                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
+                        pushUpdate(context, views, appId);
-
+                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_TODAY)) {
-                        pushUpdate(context, views, appId);
+                        int rday = getToday(context);
-                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_REFRESH)) {
+                        setSelectedDay(context, appId, rday);
-                        PendingIntent pendingIntent = HomeWidgetLaunchIntent.INSTANCE.getActivity(context, MainActivity.class, Uri.parse("timetable://refresh"));
+
-                        pendingIntent.send();
+                        views.setTextViewText(R.id.nav_current, convertDayOfWeek(context, rday));
-                    } else if (intent.getAction().equals("android.appwidget.action.APPWIDGET_DELETED")) {
+
-                        DBManager dbManager = new DBManager(context.getApplicationContext());
+                        pushUpdate(context, views, appId);
-
+                    } else if (intent.getAction().equals(ACTION_WIDGET_CLICK_NAV_REFRESH)) {
-                        try {
+                        PendingIntent pendingIntent = HomeWidgetLaunchIntent.INSTANCE.getActivity(context, MainActivity.class, Uri.parse("timetable://refresh"));
-                            dbManager.open();
+                        pendingIntent.send();
-                            dbManager.deleteWidget(appId);
+                    } else if (intent.getAction().equals("android.appwidget.action.APPWIDGET_DELETED")) {
-                            dbManager.close();
+                        DBManager dbManager = new DBManager(context.getApplicationContext());
-                        } catch (Exception e) {
+
-                            e.printStackTrace();
+                        try {
-                        }
+                            dbManager.open();
-                    }
+                            dbManager.deleteWidget(appId);
-                }
+                            dbManager.close();
-
+                        } catch (Exception e) {
-                if(intent.getAction().equals(ACTION_WIDGET_CLICK_BUY_PREMIUM)) {
+                            e.printStackTrace();
-                    PendingIntent pendingIntent = HomeWidgetLaunchIntent.INSTANCE.getActivity(context, MainActivity.class, Uri.parse("settings://premium"));
+                        }
-                    pendingIntent.send();
+                    }
-                }
+                }
-            }
+
-            catch (Exception e) {
+                if(intent.getAction().equals(ACTION_WIDGET_CLICK_BUY_PREMIUM)) {
-                e.printStackTrace();
+                    PendingIntent pendingIntent = HomeWidgetLaunchIntent.INSTANCE.getActivity(context, MainActivity.class, Uri.parse("settings://premium"));
-            }
+                    pendingIntent.send();
-        }
+                }
-    }
+            }
-
+            catch (Exception e) {
-    public static String convertDayOfWeek(Context context, int rday) {
+                e.printStackTrace();
-
+            }
-        /*if(rday == -1) return DayOfWeek.of(1).getDisplayName(TextStyle.FULL, new Locale("hu", "HU"));
+        }
-
+    }
-        String dayOfWeek = DayOfWeek.of(rday + 1).getDisplayName(TextStyle.FULL, new Locale("hu", "HU"));*/
+
-
+    public static String convertDayOfWeek(Context context, int rday) {
-        String dayOfWeek = "Unknown";
+
-
+        /*if(rday == -1) return DayOfWeek.of(1).getDisplayName(TextStyle.FULL, new Locale("hu", "HU"));
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+
-            Locale loc = getLocale(context);
+        String dayOfWeek = DayOfWeek.of(rday + 1).getDisplayName(TextStyle.FULL, new Locale("hu", "HU"));*/
-
+
-            if (rday == -1)
+        String dayOfWeek = "Unknown";
-                return DayOfWeek.of(1).getDisplayName(TextStyle.FULL, loc);
+
-
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            dayOfWeek = DayOfWeek.of(rday + 1).getDisplayName(TextStyle.FULL, loc);
+            Locale loc = getLocale(context);
-        }
+
-
+            if (rday == -1)
-        return dayOfWeek.substring(0, 1).toUpperCase() + dayOfWeek.substring(1).toLowerCase();
+                return DayOfWeek.of(1).getDisplayName(TextStyle.FULL, loc);
-    }
+
-
+            dayOfWeek = DayOfWeek.of(rday + 1).getDisplayName(TextStyle.FULL, loc);
-    public static void setSelectedDay(Context context, int wid, int day) {
+        }
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+
-
+        return dayOfWeek.substring(0, 1).toUpperCase() + dayOfWeek.substring(1).toLowerCase();
-        try {
+    }
-            dbManager.open();
+
-            dbManager.update(wid, day);
+    public static void setSelectedDay(Context context, int wid, int day) {
-            dbManager.close();
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-        } catch (Exception e) {
+
-            e.printStackTrace();
+        try {
-        }
+            dbManager.open();
-    }
+            dbManager.update(wid, day);
-
+            dbManager.close();
-    public static int getToday(Context context) {
+        } catch (Exception e) {
-        int rday = new DateTime().getDayOfWeek() - 1;
+            e.printStackTrace();
-        List<JSONArray> s = genJsonDays(context);
+        }
-
+    }
-        try {
+
-            if(checkIsAfter(s, rday)) rday += 1;
+    public static int getToday(Context context) {
-        } catch (Exception e) {
+        int rday = new DateTime().getDayOfWeek() - 1;
-            e.printStackTrace();
+        List<JSONArray> s = genJsonDays(context);
-        }
+
-        return retDay(rday, s.size());
+        try {
-    }
+            if(checkIsAfter(s, rday)) rday += 1;
-
+        } catch (Exception e) {
-    public static int selectDay(Context context, int wid, int add, Boolean afterSubjects) {
+            e.printStackTrace();
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+        }
-
+        return retDay(rday, s.size());
-        try {
+    }
-            dbManager.open();
+
-            Cursor cursor = dbManager.fetchWidget(wid);
+    public static int selectDay(Context context, int wid, int add, Boolean afterSubjects) {
-
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-            List<JSONArray> s = genJsonDays(context);
+
-            int retday = new DateTime().getDayOfWeek() - 1;
+        try {
-
+            dbManager.open();
-            if(cursor.getCount() != 0) retday = retDay(cursor.getInt(1) + add, s.size());
+            Cursor cursor = dbManager.fetchWidget(wid);
-
+
-            if(afterSubjects) if(checkIsAfter(s, retday)) retday += 1;
+            List<JSONArray> s = genJsonDays(context);
-            retday = retDay(retday, s.size());
+            int retday = new DateTime().getDayOfWeek() - 1;
-
+
-            if(cursor.getCount() == 0) dbManager.insertSelDay(wid, retday);
+            if(cursor.getCount() != 0) retday = retDay(cursor.getInt(1) + add, s.size());
-            else dbManager.update(wid, retday);
+
-
+            if(afterSubjects) if(checkIsAfter(s, retday)) retday += 1;
-            dbManager.close();
+            retday = retDay(retday, s.size());
-
+
-            return retday;
+            if(cursor.getCount() == 0) dbManager.insertSelDay(wid, retday);
-        } catch (Exception e) {
+            else dbManager.update(wid, retday);
-            e.printStackTrace();
+
-        }
+            dbManager.close();
-
+
-        return 0;
+            return retday;
-    }
+        } catch (Exception e) {
-
+            e.printStackTrace();
-    public static Boolean checkIsAfter(List<JSONArray> s, int retday) throws Exception {
+        }
-        retday = retDay(retday, s.size());
+
-
+        return 0;
-        String vegIdopont = s.get(retday).getJSONObject(s.get(retday).length() - 1).getString("VegIdopont");
+    }
-
+
-        return new DateTime().isAfter(new DateTime(vegIdopont));
+    public static Boolean checkIsAfter(List<JSONArray> s, int retday) throws Exception {
-    }
+        retday = retDay(retday, s.size());
-
+
-    public static int retDay(int retday, int size) {
+        String vegIdopont = s.get(retday).getJSONObject(s.get(retday).length() - 1).getString("VegIdopont");
-        if (retday < 0) retday = size - 1;
+
-        else if (retday > size - 1) retday = 0;
+        return new DateTime().isAfter(new DateTime(vegIdopont));
-
+    }
-        return retday;
+
-    }
+    public static int retDay(int retday, int size) {
-
+        if (retday < 0) retday = size - 1;
-    public static List<JSONArray> genJsonDays(Context context) {
+        else if (retday > size - 1) retday = 0;
-        List<JSONArray> gen_days = new ArrayList<>();
+
-
+        return retday;
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+    }
-        try {
+
-            dbManager.open();
+    public static List<JSONArray> genJsonDays(Context context) {
-            Cursor ct = dbManager.fetchTimetable();
+        List<JSONArray> genDays = new ArrayList<>();
-            dbManager.close();
+        Map<String, JSONArray> dayMap = new HashMap<>();
-
+
-            if(ct.getCount() == 0) {
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-                return gen_days;
+
-            }
+        try {
-
+            dbManager.open();
-            JSONObject fecthtt = new JSONObject(ct.getString(0));
+            Cursor ct = dbManager.fetchTimetable();
-
+
-            JSONArray dayArray = new JSONArray();
+            if (ct.getCount() == 0) {
-            String currday = "";
+                return genDays;
-
+            }
-            String currweek = String.valueOf(Week.current().id());
+
-
+            JSONObject fetchedTimetable = new JSONObject(ct.getString(0));
-            JSONArray week = fecthtt.getJSONArray(currweek);
+            String currentWeek = String.valueOf(Week.current().id());
-
+            JSONArray week = fetchedTimetable.getJSONArray(currentWeek);
-            for (int i=0; i < week.length(); i++)
+
-            {
+            // Organize lessons into dates
-                try {
+            for (int i = 0; i < week.length(); i++) {
-                    if(i == 0) currday = week.getJSONObject(0).getString("Datum");
+                try {
-                    JSONObject oraObj = week.getJSONObject(i);
+                    JSONObject entry = week.getJSONObject(i);
-
+                    String date = entry.getString("Datum");
-                    if(!currday.equals(oraObj.getString("Datum"))) {
+                    dayMap.computeIfAbsent(date, k -> new JSONArray()).put(entry);
-                        gen_days.add(dayArray);
+                } catch (JSONException e) {
-                        currday = week.getJSONObject(i).getString("Datum");
+                    e.printStackTrace();
-                        dayArray = new JSONArray();
+                }
-                    }
+            }
-
+
-                    dayArray.put(oraObj);
+            genDays.addAll(dayMap.values());
-                    if(i == week.length() - 1) {
+
-                        gen_days.add(dayArray);
+            // Sort the 'genDays' list of JSON based on the start time of the first entry
-                    }
+            genDays.sort((day1, day2) -> {
-                } catch (Exception e) {
+                try {
-                    e.printStackTrace();
+                    // 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");
-        } catch (Exception e) {
+                    // Compare the start times and return the result for sorting
-            e.printStackTrace();
+                    return startTime1.compareTo(startTime2);
-        }
+                } catch (JSONException e) {
-
+                    e.printStackTrace();
-        Collections.sort(gen_days, new Comparator<JSONArray>() {
+                    return 0;
-
+                }
-            public int compare(JSONArray a, JSONArray b) {
+            });
-                long valA = 0;
+
-                long valB = 0;
+        } catch (Exception e) {
-
+            e.printStackTrace();
-                try {
+        } finally {
-                    valA = (long) new DateTime( a.getJSONObject(0).getString("Datum")).getMillis();
+            dbManager.close();
-                    valB = (long) new DateTime( b.getJSONObject(0).getString("Datum")).getMillis();
+        }
-                }
+
-                catch (JSONException ignored) {
+        return genDays;
-                }
+    }
-
+
-                return (int) (valA - valB);
+
-            }
+
-        });
+    public static String zeroPad(int value, int padding){
-
+        StringBuilder b = new StringBuilder();
-        return gen_days;
+        b.append(value);
-    }
+        while(b.length() < padding){
-
+            b.insert(0,"0");
-    public static String zeroPad(int value, int padding){
+        }
-        StringBuilder b = new StringBuilder();
+        return b.toString();
-        b.append(value);
+    }
-        while(b.length() < padding){
+
-            b.insert(0,"0");
+    public static Locale getLocale(Context context) {
-        }
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-        return b.toString();
+
-    }
+        try {
-
+            dbManager.open();
-    public static Locale getLocale(Context context) {
+            String loc = dbManager.fetchLocale().getString(0);
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+            dbManager.close();
-
+
-        try {
+            if(loc.equals("hu") || loc.equals("de")) {
-            dbManager.open();
+                return new Locale(loc, loc.toUpperCase());
-            String loc = dbManager.fetchLocale().getString(0);
+            }
-            dbManager.close();
+        } catch (Exception e) {
-
+            e.printStackTrace();
-            if(loc.equals("hu") || loc.equals("de")) {
+        }
-                return new Locale(loc, loc.toUpperCase());
+
-            }
+        return new Locale("en", "GB");
-        } catch (Exception e) {
+    }
-            e.printStackTrace();
+
-        }
+    public static boolean premiumEnabled(Context context) {
-
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-        return new Locale("en", "GB");
+
-    }
+        try {
-
+            dbManager.open();
-    public static boolean premiumEnabled(Context context) {
+            String premium_token = dbManager.fetchPremiumToken().getString(0);
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+            String premium_scopes_raw = dbManager.fetchPremiumScopes().getString(0);
-
+            dbManager.close();
-        try {
+
-            dbManager.open();
+            JSONArray arr = new JSONArray(premium_scopes_raw);
-            String premium_token = dbManager.fetchPremiumToken().getString(0);
+            List<String> premium_scopes = new ArrayList<>();
-            String premium_scopes_raw = dbManager.fetchPremiumScopes().getString(0);
+            for(int i = 0; i < arr.length(); i++){
-            dbManager.close();
+                String scope = arr.getString(i);
-
+                premium_scopes.add(scope.substring(scope.lastIndexOf('.')  + 1));
-            JSONArray arr = new JSONArray(premium_scopes_raw);
+            }
-            List<String> premium_scopes = new ArrayList<>();
+
-            for(int i = 0; i < arr.length(); i++){
+            if(!premium_token.equals("") && (premium_scopes.contains("*") || premium_scopes.contains("TIMETALBE_WIDGET"))) {
-                String scope = arr.getString(i);
+                return true;
-                premium_scopes.add(scope.substring(scope.lastIndexOf('.')  + 1));
+            }
-            }
+        } catch (Exception e) {
-
+            e.printStackTrace();
-            if(!premium_token.equals("") && (premium_scopes.contains("*") || premium_scopes.contains("TIMETALBE_WIDGET"))) {
+        }
-                return true;
+
-            }
+        return false;
-        } catch (Exception e) {
+    }
-            e.printStackTrace();
+
-        }
+    public static boolean userLoggedIn(Context context) {
-
+        return !lastUserId(context).equals("");
-        return false;
+    }
-    }
+
-
+    public static String lastUserId(Context context) {
-    public static boolean userLoggedIn(Context context) {
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-        return !lastUserId(context).equals("");
+        try {
-    }
+            dbManager.open();
-
+            Cursor cursor = dbManager.fetchLastUser();
-    public static String lastUserId(Context context) {
+            dbManager.close();
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+
-        try {
+            if(cursor != null && !cursor.getString(0).equals("")) {
-            dbManager.open();
+                String last_user = cursor.getString(0);
-            Cursor cursor = dbManager.fetchLastUser();
+                return last_user;
-            dbManager.close();
+            }
-
+        } catch (Exception e) {
-            if(cursor != null && !cursor.getString(0).equals("")) {
+            e.printStackTrace();
-                String last_user = cursor.getString(0);
+        }
-                return last_user;
+
-            }
+        return "";
-        } catch (Exception e) {
+    }
-            e.printStackTrace();
+
-        }
+    @Override
-
+    public void onEnabled(Context context) {
-        return "";
+    }
-    }
+
-
+    @Override
-    @Override
+    public void onDisabled(Context context) {
-    public void onEnabled(Context context) {
+    }
-    }
-
-    @Override
-    public void onDisabled(Context context) {
-    }
 }

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

@@ -1,354 +1,356 @@
-package hu.filc.naplo.widget_timetable;
+package hu.refilc.naplo.widget_timetable;
-
+
-import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetManager;
-import android.content.Context;
+import android.content.Context;
-import android.content.Intent;
+import android.content.Intent;
-import android.database.Cursor;
+import android.database.Cursor;
-import android.os.Build;
+import android.os.Build;
-import android.util.Log;
+import android.util.Log;
-import android.view.View;
+import android.view.View;
-import android.widget.RemoteViews;
+import android.widget.RemoteViews;
-import android.widget.RemoteViewsService;
+import android.widget.RemoteViewsService;
-
+
-import org.joda.time.DateTime;
+import org.joda.time.DateTime;
-import org.json.JSONArray;
+import org.json.JSONArray;
-import org.json.JSONException;
+import org.json.JSONException;
-import org.json.JSONObject;
+import org.json.JSONObject;
-
+
-import java.util.ArrayList;
+import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collections;
-import java.util.Comparator;
+import java.util.Comparator;
-import java.util.List;
+import java.util.List;
-
+
-import hu.filc.naplo.database.DBManager;
+import hu.refilc.naplo.database.DBManager;
-import hu.filc.naplo.R;
+import hu.refilc.naplo.R;
-
+
-public class WidgetTimetableDataProvider implements RemoteViewsService.RemoteViewsFactory {
+public class WidgetTimetableDataProvider implements RemoteViewsService.RemoteViewsFactory {
-
+
-    private Context context;
+    private Context context;
-    private int appWidgetId;
+    private int appWidgetId;
-
+
-    private int rday = 0;
+    private int rday = 0;
-
+
-    private int theme;
+    private int theme;
-
+
-    private Integer[] colorValues;
+    private Integer[] colorValues;
-
+
-    List<Lesson> day_subjects = new ArrayList<>();
+    List<Lesson> day_subjects = new ArrayList<>();
-    List<Integer> lessonIndexes = new ArrayList<>();
+    List<Integer> lessonIndexes = new ArrayList<>();
-
+
-    Item witem;
+    Item witem;
-
+
-    /* Default values */
+    /* Default values */
-
+
-    static class Item {
+    static class Item {
-        int Layout;
+        int Layout;
-
+
-        int NumVisibility;
+        int NumVisibility;
-        int NameVisibility;
+        int NameVisibility;
-        int NameNodescVisibility;
+        int NameNodescVisibility;
-        int DescVisibility;
+        int DescVisibility;
-        int RoomVisibility;
+        int RoomVisibility;
-        int TimeVisibility;
+        int TimeVisibility;
-
+
-        int NumColor;
+        int NumColor;
-        int NameColor;
+        int NameColor;
-        int NameNodescColor;
+        int NameNodescColor;
-        int DescColor;
+        int DescColor;
-
+
-        Integer[] NameNodescPadding = {0, 0, 0, 0};
+        Integer[] NameNodescPadding = {0, 0, 0, 0};
-
+
-        public Item(int Layout, int NumVisibility,int NameVisibility,int NameNodescVisibility,int DescVisibility,int RoomVisibility,int TimeVisibility,int NumColor,int NameColor,int NameNodescColor,int DescColor) {
+        public Item(int Layout, int NumVisibility,int NameVisibility,int NameNodescVisibility,int DescVisibility,int RoomVisibility,int TimeVisibility,int NumColor,int NameColor,int NameNodescColor,int DescColor) {
-            this.Layout = Layout;
+            this.Layout = Layout;
-            this.NumVisibility = NumVisibility;
+            this.NumVisibility = NumVisibility;
-            this.NameVisibility = NameVisibility;
+            this.NameVisibility = NameVisibility;
-            this.NameNodescVisibility = NameNodescVisibility;
+            this.NameNodescVisibility = NameNodescVisibility;
-            this.DescVisibility = DescVisibility;
+            this.DescVisibility = DescVisibility;
-            this.RoomVisibility = RoomVisibility;
+            this.RoomVisibility = RoomVisibility;
-            this.TimeVisibility = TimeVisibility;
+            this.TimeVisibility = TimeVisibility;
-
+
-            this.NumColor = NumColor;
+            this.NumColor = NumColor;
-            this.NameColor = NameColor;
+            this.NameColor = NameColor;
-            this.NameNodescColor = NameNodescColor;
+            this.NameNodescColor = NameNodescColor;
-            this.DescColor = DescColor;
+            this.DescColor = DescColor;
-        }
+        }
-    }
+    }
-
+
-    static class Lesson {
+    static class Lesson {
-        String status;
+        String status;
-        String lessonIndex;
+        String lessonIndex;
-        String lessonName;
+        String lessonName;
-        String lessonTopic;
+        String lessonTopic;
-        String lessonRoom;
+        String lessonRoom;
-        long lessonStart;
+        long lessonStart;
-        long lessonEnd;
+        long lessonEnd;
-        String substituteTeacher;
+        String substituteTeacher;
-
+
-        public Lesson(String status, String lessonIndex,String lessonName,String lessonTopic, String lessonRoom,long lessonStart,long lessonEnd,String substituteTeacher) {
+        public Lesson(String status, String lessonIndex,String lessonName,String lessonTopic, String lessonRoom,long lessonStart,long lessonEnd,String substituteTeacher) {
-            this.status = status;
+            this.status = status;
-            this.lessonIndex = lessonIndex;
+            this.lessonIndex = lessonIndex;
-            this.lessonName = lessonName;
+            this.lessonName = lessonName;
-            this.lessonTopic = lessonTopic;
+            this.lessonTopic = lessonTopic;
-            this.lessonRoom = lessonRoom;
+            this.lessonRoom = lessonRoom;
-            this.lessonStart = lessonStart;
+            this.lessonStart = lessonStart;
-            this.lessonEnd = lessonEnd;
+            this.lessonEnd = lessonEnd;
-            this.substituteTeacher = substituteTeacher;
+            this.substituteTeacher = substituteTeacher;
-        }
+        }
-    }
+    }
-
+
-    Integer[] itemNameNodescPadding = {0, 0, 0, 0};
+    Integer[] itemNameNodescPadding = {0, 0, 0, 0};
-
+
-    public WidgetTimetableDataProvider(Context context, Intent intent) {
+    public WidgetTimetableDataProvider(Context context, Intent intent) {
-        this.context = context;
+        this.context = context;
-        this.appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+        this.appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
-
+
-        this.theme = getThemeAccent(context);
+        this.theme = getThemeAccent(context);
-
+
-        this.colorValues = new Integer[]{R.color.filc,
+        this.colorValues = new Integer[]{R.color.filc,
-                R.color.blue_shade300,
+                R.color.blue_shade300,
-                R.color.green_shade300,
+                R.color.green_shade300,
-                R.color.lime_shade300,
+                R.color.lime_shade300,
-                R.color.yellow_shade300,
+                R.color.yellow_shade300,
-                R.color.orange_shade300,
+                R.color.orange_shade300,
-                R.color.red_shade300,
+                R.color.red_shade300,
-                R.color.pink_shade300,
+                R.color.pink_shade300,
-                R.color.purple_shade300};
+                R.color.purple_shade300};
-
+
-    }
+    }
-
+
-    @Override
+    @Override
-    public void onCreate() {
+    public void onCreate() {
-        initData();
+        initData();
-    }
+    }
-
+
-    @Override
+    @Override
-    public void onDataSetChanged() {
+    public void onDataSetChanged() {
-        initData();
+        initData();
-    }
+    }
-
+
-    @Override
+    @Override
-    public void onDestroy() {
+    public void onDestroy() {
-
+
-    }
+    }
-
+
-    @Override
+    @Override
-    public int getCount() {
+    public int getCount() {
-
+
-        return day_subjects.size();
+        return day_subjects.size();
-    }
+    }
-
+
-    public void setLayout(final RemoteViews view) {
+    public void setLayout(final RemoteViews view) {
-        /* Visibilities */
+        /* Visibilities */
-        view.setViewVisibility(R.id.tt_item_num, witem.NumVisibility);
+        view.setViewVisibility(R.id.tt_item_num, witem.NumVisibility);
-        view.setViewVisibility(R.id.tt_item_name, witem.NameVisibility);
+        view.setViewVisibility(R.id.tt_item_name, witem.NameVisibility);
-        view.setViewVisibility(R.id.tt_item_name_nodesc, witem.NameNodescVisibility);
+        view.setViewVisibility(R.id.tt_item_name_nodesc, witem.NameNodescVisibility);
-        view.setViewVisibility(R.id.tt_item_desc, witem.DescVisibility);
+        view.setViewVisibility(R.id.tt_item_desc, witem.DescVisibility);
-        view.setViewVisibility(R.id.tt_item_room, witem.RoomVisibility);
+        view.setViewVisibility(R.id.tt_item_room, witem.RoomVisibility);
-        view.setViewVisibility(R.id.tt_item_time, witem.TimeVisibility);
+        view.setViewVisibility(R.id.tt_item_time, witem.TimeVisibility);
-
+
-        /* backgroundResources */
+        /* backgroundResources */
-        view.setInt(R.id.main_lay, "setBackgroundResource", witem.Layout);
+        view.setInt(R.id.main_lay, "setBackgroundResource", witem.Layout);
-
+
-        /* Paddings */
+        /* Paddings */
-        view.setViewPadding(R.id.tt_item_name_nodesc, witem.NameNodescPadding[0], witem.NameNodescPadding[1], witem.NameNodescPadding[2], witem.NameNodescPadding[3]);
+        view.setViewPadding(R.id.tt_item_name_nodesc, witem.NameNodescPadding[0], witem.NameNodescPadding[1], witem.NameNodescPadding[2], witem.NameNodescPadding[3]);
-
+
-        /* Text Colors */
+        /* Text Colors */
-        view.setInt(R.id.tt_item_num, "setTextColor", getColor(context, witem.NumColor));
+        view.setInt(R.id.tt_item_num, "setTextColor", getColor(context, witem.NumColor));
-        view.setInt(R.id.tt_item_name, "setTextColor",  getColor(context, witem.NameColor));
+        view.setInt(R.id.tt_item_name, "setTextColor",  getColor(context, witem.NameColor));
-        view.setInt(R.id.tt_item_name_nodesc, "setTextColor",  getColor(context, witem.NameNodescColor));
+        view.setInt(R.id.tt_item_name_nodesc, "setTextColor",  getColor(context, witem.NameNodescColor));
-        view.setInt(R.id.tt_item_desc, "setTextColor",  getColor(context, witem.DescColor));
+        view.setInt(R.id.tt_item_desc, "setTextColor",  getColor(context, witem.DescColor));
-    }
+    }
-
+
-    public int getColor(Context context, int color) {
+    public int getColor(Context context, int color) {
-        return context.getResources().getColor(color);
+        return context.getResources().getColor(color);
-    }
+    }
-
+
-    @Override
+    @Override
-    public RemoteViews getViewAt(int position) {
+    public RemoteViews getViewAt(int position) {
-        RemoteViews view = new RemoteViews(context.getPackageName(), R.layout.timetable_item);
+        RemoteViews view = new RemoteViews(context.getPackageName(), R.layout.timetable_item);
-
+
-        witem = defaultItem(theme);
+        witem = defaultItem(theme);
-
+
-        Lesson curr_subject = day_subjects.get(position);
+        Lesson curr_subject = day_subjects.get(position);
-
+
-        if (curr_subject.status.equals("empty")) {
+        if (curr_subject.status.equals("empty")) {
-            witem.NumColor = R.color.text_miss_num;
+            witem.NumColor = R.color.text_miss_num;
-
+
-            witem.TimeVisibility = View.GONE;
+            witem.TimeVisibility = View.GONE;
-            witem.RoomVisibility = View.GONE;
+            witem.RoomVisibility = View.GONE;
-
+
-            witem.NameNodescColor = R.color.text_miss;
+            witem.NameNodescColor = R.color.text_miss;
-        }
+        }
-
+
-        if (!curr_subject.substituteTeacher.equals("null")) {
+        if (!curr_subject.substituteTeacher.equals("null")) {
-            witem.NumColor = R.color.yellow;
+            witem.NumColor = R.color.yellow;
-            witem.Layout = R.drawable.card_layout_tile_helyetesitett;
+            witem.Layout = R.drawable.card_layout_tile_helyetesitett;
-        }
+        }
-
+
-        if (curr_subject.status.equals("Elmaradt")) {
+        if (curr_subject.status.equals("Elmaradt")) {
-            witem.NumColor = R.color.red;
+            witem.NumColor = R.color.red;
-            witem.Layout = R.drawable.card_layout_tile_elmarad;
+            witem.Layout = R.drawable.card_layout_tile_elmarad;
-        } else if (curr_subject.status.equals("TanevRendjeEsemeny")) {
+        } else if (curr_subject.status.equals("TanevRendjeEsemeny")) {
-            witem.NumVisibility = View.GONE;
+            witem.NumVisibility = View.GONE;
-            witem.TimeVisibility = View.GONE;
+            witem.TimeVisibility = View.GONE;
-            witem.RoomVisibility = View.GONE;
+            witem.RoomVisibility = View.GONE;
-
+
-            witem.NameNodescPadding[0] = 50;
+            witem.NameNodescPadding[0] = 50;
-            witem.NameNodescPadding[2] = 50;
+            witem.NameNodescPadding[2] = 50;
-
+
-            witem.NameNodescColor = R.color.text_miss;
+            witem.NameNodescColor = R.color.text_miss;
-        }
+        }
-
+
-        if (curr_subject.lessonTopic.equals("null")) {
+        if (curr_subject.lessonTopic.equals("null")) {
-            witem.DescVisibility = View.GONE;
+            witem.DescVisibility = View.GONE;
-            witem.NameVisibility = View.GONE;
+            witem.NameVisibility = View.GONE;
-
+
-            witem.NameNodescVisibility = View.VISIBLE;
+            witem.NameNodescVisibility = View.VISIBLE;
-        }
+        }
-
+
-        setLayout(view);
+        setLayout(view);
-
+
-        String lessonIndexTrailing = curr_subject.lessonIndex.equals("+") ? "" : ".";
+        String lessonIndexTrailing = curr_subject.lessonIndex.equals("+") ? "" : ".";
-
+
-        view.setTextViewText(R.id.tt_item_num, curr_subject.lessonIndex + lessonIndexTrailing);
+        view.setTextViewText(R.id.tt_item_num, curr_subject.lessonIndex + lessonIndexTrailing);
-        view.setTextViewText(R.id.tt_item_name, curr_subject.lessonName);
+        view.setTextViewText(R.id.tt_item_name, curr_subject.lessonName);
-        view.setTextViewText(R.id.tt_item_name_nodesc, curr_subject.lessonName);
+        view.setTextViewText(R.id.tt_item_name_nodesc, curr_subject.lessonName);
-        view.setTextViewText(R.id.tt_item_desc, curr_subject.lessonTopic);
+        view.setTextViewText(R.id.tt_item_desc, curr_subject.lessonTopic);
-        view.setTextViewText(R.id.tt_item_room, curr_subject.lessonRoom);
+        view.setTextViewText(R.id.tt_item_room, curr_subject.lessonRoom);
-        if(curr_subject.lessonStart != 0 && curr_subject.lessonEnd != 0)
+        if(curr_subject.lessonStart != 0 && curr_subject.lessonEnd != 0)
-            view.setTextViewText(R.id.tt_item_time, WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonStart).getHourOfDay(), 2) + ":" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonStart).getMinuteOfHour(), 2) +
+            view.setTextViewText(R.id.tt_item_time, WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonStart).getHourOfDay(), 2) + ":" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonStart).getMinuteOfHour(), 2) +
-                    "\n" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonEnd).getHourOfDay(), 2) + ":" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonEnd).getMinuteOfHour(),2));
+                    "\n" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonEnd).getHourOfDay(), 2) + ":" + WidgetTimetable.zeroPad(new DateTime(curr_subject.lessonEnd).getMinuteOfHour(),2));
-
+
-        return view;
+        return view;
-    }
+    }
-
+
-    @Override
+    @Override
-    public RemoteViews getLoadingView() {
+    public RemoteViews getLoadingView() {
-        return null;
+        return null;
-    }
+    }
-
+
-    @Override
+    @Override
-    public int getViewTypeCount() {
+    public int getViewTypeCount() {
-        return 1;
+        return 1;
-    }
+    }
-
+
-    @Override
+    @Override
-    public long getItemId(int position) {
+    public long getItemId(int position) {
-        return position;
+        return position;
-    }
+    }
-
+
-    @Override
+    @Override
-    public boolean hasStableIds() {
+    public boolean hasStableIds() {
-        return true;
+        return true;
-    }
+    }
-
+
-    private void initData() {
+    private void initData() {
-
+
-        theme = getThemeAccent(context);
+        theme = getThemeAccent(context);
-
+
-        rday = WidgetTimetable.selectDay(context, appWidgetId, 0, false);
+        rday = WidgetTimetable.selectDay(context, appWidgetId, 0, false);
-
+
-        day_subjects.clear();
+        day_subjects.clear();
-        lessonIndexes.clear();
+        lessonIndexes.clear();
-
+
-        try {
+        try {
-            List<JSONArray> arr = WidgetTimetable.genJsonDays(context);
+            List<JSONArray> arr = WidgetTimetable.genJsonDays(context);
-
+
-            if(arr.isEmpty()) {
+            if(arr.isEmpty()) {
-                return;
+                return;
-            }
+            }
-            JSONArray arr_lessons = WidgetTimetable.genJsonDays(context).get(rday);
+            JSONArray arr_lessons = WidgetTimetable.genJsonDays(context).get(rday);
-
+
-            for (int i = 0; i < arr_lessons.length(); i++) {
+            for (int i = 0; i < arr_lessons.length(); i++) {
-                JSONObject obj_lessons = arr_lessons.getJSONObject(i);
+                JSONObject obj_lessons = arr_lessons.getJSONObject(i);
-
+
-                day_subjects.add(jsonToLesson(obj_lessons));
+                day_subjects.add(jsonToLesson(obj_lessons));
-            }
+            }
-        } catch (JSONException e) {
+        } catch (JSONException e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-
+
-        if(day_subjects.size() > 0) {
+        if(day_subjects.size() > 0) {
-            Collections.sort(day_subjects, new Comparator<Lesson>() {
+            Collections.sort(day_subjects, new Comparator<Lesson>() {
-                public int compare(Lesson o1, Lesson o2) {
+                public int compare(Lesson o1, Lesson o2) {
-                    return new DateTime(o1.lessonStart).compareTo(new DateTime(o2.lessonStart));
+                    return new DateTime(o1.lessonStart).compareTo(new DateTime(o2.lessonStart));
-                }
+                }
-            });
+            });
-
+
-            for (int i = 0; i < day_subjects.size(); i++) {
+            for (int i = 0; i < day_subjects.size(); i++) {
-                if(!day_subjects.get(i).lessonIndex.equals("+")) {
+                if(!day_subjects.get(i).lessonIndex.equals("+")) {
-                    lessonIndexes.add(Integer.valueOf(day_subjects.get(i).lessonIndex));
+                    lessonIndexes.add(Integer.valueOf(day_subjects.get(i).lessonIndex));
-                }
+                }
-            }
+            }
-
+
-            if(lessonIndexes.size() > 0) {
+            if(lessonIndexes.size() > 0) {
-
+
-                int lessonsChecked = Collections.min(lessonIndexes);
+                int lessonsChecked = Collections.min(lessonIndexes);
-                int i = 0;
+                int i = 0;
-
+
-                while(lessonsChecked < Collections.max(lessonIndexes)) {
+                while(lessonsChecked < Collections.max(lessonIndexes)) {
-                    if(!lessonIndexes.contains(lessonsChecked)) {
+                    if(!lessonIndexes.contains(lessonsChecked)) {
-                        day_subjects.add(i, emptyLesson(lessonsChecked));
+                        day_subjects.add(i, emptyLesson(lessonsChecked));
-                    }
+                    }
-                    lessonsChecked++;
+                    lessonsChecked++;
-                    i++;
+                    i++;
-                }
+                }
-            }
+            }
-        }
+        }
-    }
+    }
-
+
-    public static Integer getThemeAccent(Context context) {
+    public static Integer getThemeAccent(Context context) {
-        DBManager dbManager = new DBManager(context.getApplicationContext());
+        DBManager dbManager = new DBManager(context.getApplicationContext());
-
+
-        try {
+        try {
-            dbManager.open();
+            dbManager.open();
-            Cursor cursor = dbManager.fetchTheme();
+            Cursor cursor = dbManager.fetchTheme();
-            dbManager.close();
+            dbManager.close();
-
+
-            return cursor.getInt(1);
+            return cursor.getInt(1);
-        } catch (Exception e) {
+        } catch (Exception e) {
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-
+
-        return 0;
+        return 0;
-    }
+    }
-
+
-    public Item defaultItem(int theme) {
+    public Item defaultItem(int theme) {
-        return new Item(
+        return new Item(
-                R.drawable.card_layout_tile,
+                R.drawable.card_layout_tile,
-                View.VISIBLE,
+                View.VISIBLE,
-                View.VISIBLE,
+                View.VISIBLE,
-                View.INVISIBLE,
+                View.INVISIBLE,
-                View.VISIBLE,
+                View.VISIBLE,
-                View.VISIBLE,
+                View.VISIBLE,
-                View.VISIBLE,
+                View.VISIBLE,
-                colorValues[theme >= colorValues.length ? 0 : theme],
+                colorValues[theme >= colorValues.length ? 0 : theme],
-                R.color.text,
+                R.color.text,
-                R.color.text,
+                R.color.text,
-                R.color.text_desc
+                R.color.text_desc
-        );
+        );
-    }
+    }
-
+
-    public Lesson emptyLesson(int lessonIndex) {
+    public Lesson emptyLesson(int lessonIndex) {
-        return new Lesson("empty", String.valueOf(lessonIndex), "Lyukasóra", "null", "null", 0, 0, "null");
+        return new Lesson("empty", String.valueOf(lessonIndex), "Lyukasóra", "null", "null", 0, 0, "null");
-    }
+    }
-
+
-    public Lesson jsonToLesson(JSONObject json) {
+    public Lesson jsonToLesson(JSONObject json) {
-        try {
+        try {
-            return new Lesson(
+            String name = json.getString("Nev");
-                    json.getJSONObject("Allapot").getString("Nev"),
+            name = name.substring(0, 1).toUpperCase() + name.substring(1); // Capitalize name
-                    !json.getString("Oraszam").equals("null") ? json.getString("Oraszam") : "+",
+            return new Lesson(
-                    json.getString("Nev"),
+                    json.getJSONObject("Allapot").getString("Nev"),
-                    json.getString("Tema"),
+                    !json.getString("Oraszam").equals("null") ? json.getString("Oraszam") : "+",
-                    json.getString("TeremNeve"),
+                    name,
-                    new DateTime(json.getString("KezdetIdopont")).getMillis(),
+                    json.getString("Tema"),
-                    new DateTime(json.getString("VegIdopont")).getMillis(),
+                    json.getString("TeremNeve"),
-                    json.getString("HelyettesTanarNeve")
+                    new DateTime(json.getString("KezdetIdopont")).getMillis(),
-            );
+                    new DateTime(json.getString("VegIdopont")).getMillis(),
-        }catch (Exception e) {
+                    json.getString("HelyettesTanarNeve")
-            Log.d("Filc", "exception: " + e);
+            );
-        };
+        }catch (Exception e) {
-
+            Log.d("Filc", "exception: " + e);
-        return null;
+        };
-    }
+
+        return null;
+    }
 }

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

@@ -1,12 +1,12 @@
-package hu.filc.naplo.widget_timetable;
+package hu.refilc.naplo.widget_timetable;
-
+
-import android.content.Intent;
+import android.content.Intent;
-import android.os.Build;
+import android.os.Build;
-import android.widget.RemoteViewsService;
+import android.widget.RemoteViewsService;
-
+
-public class WidgetTimetableService extends RemoteViewsService {
+public class WidgetTimetableService extends RemoteViewsService {
-    @Override
+    @Override
-    public RemoteViewsFactory onGetViewFactory(Intent intent) {
+    public RemoteViewsFactory onGetViewFactory(Intent intent) {
-        return new WidgetTimetableDataProvider(getApplicationContext(), intent);
+        return new WidgetTimetableDataProvider(getApplicationContext(), intent);
-    }
+    }
-}
+}

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"
+        tools:ignore="HardcodedText" />
-        android:text="1."
-        android:gravity="center"
-        android:textColor="@color/filc"></TextView>
 
     <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:layout_toEndOf="@id/tt_item_num"
-        android:textColor="@color/text"></TextView>
+        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:layout_toEndOf="@id/tt_item_num"
-        android:textColor="@color/text"></TextView>
+        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_toEndOf="@id/tt_item_num"
-        android:layout_toLeftOf="@id/tt_item_room"
+        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:layout_toStartOf="@id/tt_item_time"
-        android:textColor="@color/text_desc"></TextView>
+        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:layout_alignParentEnd="true"
-        android:textColor="@color/white"></TextView>
+        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_alignParentStart="true"
-                android:layout_marginLeft="20sp"
+                android:layout_marginStart="15sp"
-                android:layout_toLeftOf="@id/nav_refresh"
+                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:textSize="22sp"
-                android:textStyle="bold" />
+                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:textSize="17sp"
-            android:textStyle="bold" />
+            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:textSize="16sp"
-            android:textStyle="bold"/>
+            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:textSize="16sp"
-            android:textStyle="bold" />
+            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:textSize="16sp"
-            android:textStyle="bold"/>
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />
 
     </RelativeLayout>
 

filcnaplo/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
 </adaptive-icon>

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/android/app/src/profile/AndroidManifest.xml

@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.filc.naplo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.refilc.naplo">
   <!-- Permissions -->
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.VIBRATE" />

filcnaplo/build-ipa.sh

@@ -1,3 +1,7 @@
 #!/bin/sh
 
+flutter clean
+dart pub get
+flutter doctor -v
+
 flutter build ipa --release --dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1) --no-tree-shake-icons

filcnaplo/ios/Podfile.lock

@@ -1,231 +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
-  - 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`)
-  - 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"
-  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: 817ab1d8cd2da9d2da412a417162deee3500fc95
-  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
-  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
-  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
-  quick_actions_ios: 9e80dcfadfbc5d47d9cf8f47bcf428b11cf383d4
-  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
-  SDWebImageWebPCoder: 18503de6621dd2c420d680e33d46bf8e1d5169b0
-  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  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 */
 
@@ -478,7 +478,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = 195;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = reFilc;
@@ -488,7 +488,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 3.6.0;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -510,7 +510,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = livecard/Info.plist;
@@ -526,7 +526,7 @@
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo.livecardpro;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo.livecardpro;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -552,7 +552,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = livecard/Info.plist;
@@ -567,7 +567,7 @@
 				);
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo.livecardpro;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo.livecardpro;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -592,7 +592,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = livecard/Info.plist;
@@ -607,7 +607,7 @@
 				);
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo.livecardpro;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo.livecardpro;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -736,7 +736,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = 195;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = reFilc;
@@ -746,7 +746,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 3.6.0;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -764,7 +764,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = 195;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = reFilc;
@@ -774,7 +774,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 3.6.0;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilctest.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;