Merge pull request #21 from TMarccci/master

LiveActivity

.github/workflows/android.yml

@@ -0,0 +1,40 @@
+name: Build for Android
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Download Android keystore
+        id: android_keystore
+        uses: timheuer/base64-to-file@v1.0.3
+        with:
+          fileName: upload-keystore.jks
+          encodedString: ${{ secrets.KEYSTORE_BASE64 }}
+      - name: Create key.properties
+        run: |
+          echo "storeFile=${{ steps.android_keystore.outputs.filePath }}" > filcnaplo/android/key.properties
+          echo "storePassword=${{ secrets.STORE_PASSWORD }}" >> filcnaplo/android/key.properties
+          echo "keyPassword=${{ secrets.KEY_PASSWORD }}" >> filcnaplo/android/key.properties
+          echo "keyAlias=${{ secrets.KEY_ALIAS }}" >> filcnaplo/android/key.properties
+      - uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: "17.x"
+          cache: "gradle"
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: "3.10.2"
+          channel: "stable"
+          cache: "true"
+      - name: Install dependencies
+        run: ./fix-pub.sh
+      - name: Build
+        run: cd filcnaplo && ./build.sh
+      - name: Upload Android Release
+        uses: actions/upload-artifact@v2
+        with:
+          name: android-release
+          path: build/outputs/flutter-apk/app-release.apk

.github/workflows/ios.yml

@@ -0,0 +1,65 @@
+name: "Build and Publish iOS"
+on: workflow_dispatch
+    
+jobs:
+  build:
+    runs-on: macos-latest
+    steps:
+      # Checks-out our repository under $GITHUB_WORKSPACE, so our job can access it
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # Install the Apple certificate and provisioning profile 
+      - name: Install the Apple certificate and provisioning profile
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          # create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+          # import certificate and provisioning profile from secrets
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
+          echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode --output $PP_PATH
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          # import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
+          # apply provisioning profile
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
+      # Install flutter
+      - name: Flutter get
+        uses: subosito/flutter-action@v1
+        with:
+          flutter-version: '3.10.2'
+
+      # Install your project's dependencies
+      - name: Install dependencies
+        run: bash fix-pub.sh
+
+      # Build and sign the ipa using a single flutter command
+      - name: Building IPA
+        working-directory: filcnaplo
+        run: bash build-ipa.sh
+          
+      # Collect the file and upload as artifact         
+      - name: collect ipa artifacts
+        uses: actions/upload-artifact@v2
+        with:
+         name: release-ipa
+         # Path to the release files
+         path: filcnaplo/build/ios/ipa/*.ipa
+
+      # Important! Cleanup: remove the certificate and provisioning profile from the runner!
+      - name: Clean up keychain and provisioning profile
+        if: ${{ always() }}
+        run: |
+          security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
+          rm ~/Library/MobileDevice/Provisioning\ Profiles/build_pp.mobileprovision

.gitignore

@@ -25,3 +25,28 @@ doc/api/
 *.js.map
 
 *.txt
+filcnaplo/linux/flutter/generated_plugin_registrant.cc
+filcnaplo/linux/flutter/generated_plugin_registrant.h
+filcnaplo/linux/flutter/generated_plugins.cmake
+filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/connectivity_plus
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/dynamic_color
+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/GeneratedPluginRegistrant.swift
+filcnaplo/linux/flutter/generated_plugin_registrant.cc
+filcnaplo/linux/flutter/generated_plugin_registrant.h
+filcnaplo/linux/flutter/generated_plugins.cmake
+filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift
+.vscode/
+key.properties

.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,27 @@
       "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",
+      "flutterMode": "release",
+      "program": "lib/main.dart",
+      "toolArgs": [
+        "--dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1)"
+      ]
+    },
+    {
+      "name": "Flutter",
+      "program": "lib/main.dart",
+      "cwd": "filcnaplo",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "debug"
     }
   ]
 }

CONTRIBUTING.md

@@ -1,33 +1,33 @@
 
-# Contributing Guide
+# Hozzájárulási útmutató
 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.
 Segít, ha nem csak kicsit tudsz programozni, és ha ismered a Gitet és a GitHubot ;)
 
 ## Miben segítsek?
-Kérünk, **olyan dologgal járulj hozzá** a Filchez, 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 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.
 
-Fontos, hogy **mielőtt egy nagy volumenű projektbe belekezdesz, futtasd meg ötletedet a [Discord szerverünkön](https://filcnaplo.hu/discord),** 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 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.
 
-A legjobban annak örülünk, ha az [Issues](https://github.com/filcnaplo/filcnaplo/issues) oldalról szemezgetsz, **ha lehet, a [priority taggel megjelöltekkel kezdd](https://github.com/filcnaplo/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/filcnaplo/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 lehet, a [help wanted taggel megjelöltekkel kezdd](https://github.com/refilc/naplo/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22),** vagy ha új vagy a Flutterhez, 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 épp 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 feltelepítésében.
 
-A Filc 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.
+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.
 Ha még nem használtál Fluttert, mindenképp böngészd át a [YouTube csatornájukat](https://www.youtube.com/channel/UCwXdFgeE9KYzlDdR7TG9cMw).
 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)
+#### [Segítség a Flutter telepítéséhez és a forráskód futtatásához](https://docs.flutter.dev/get-started/install)
 Fontos: **Legyél a flutter beta verzióján!** Írd be: `flutter channel beta`
 
 
 
-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 Filcen 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.
+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.
 
 Készíts egy forkot a saját fiókod alá.
-A Filc legfrissebb, épp fejlesztés alatt álló verzióját a [dev brancen](https://github.com/filcnaplo/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.
+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 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.
 
 ---

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2021, Filc
+Copyright (c) 2023, reFilc
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -1,11 +1,11 @@
 <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.
 
-[![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?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)
 
 ## Setup
 
@@ -18,13 +18,7 @@ cd naplo
 
 ### Install packages
 
-```sh
-cd filcnaplo && flutter pub get && cd ..
-cd filcnaplo_mobile_ui && flutter pub get && cd ..
-cd filcnaplo_desktop_ui && flutter pub get && cd ..
-cd filcnaplo_kreta_api && flutter pub get && cd ..
-cd filcnaplo_premium && flutter pub get && cd ..
-```
+Run `fix-pub.sh`
 
 ### Run the app
 
@@ -33,12 +27,16 @@ cd filcnaplo
 flutter run
 ```
 
+### Contribution
+
+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
 
 **annon:** a Filc napló készítője (ez az app a Filcen alapul)
 
-**kima, chromium, peighter, mog, WolfY:** a fejlesztői csapat
+**kima, mog, WolfY:** fő fejlesztők
 
 **Regő, Pearoo:** weboldal design és community management

filcnaplo/.gitignore

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

filcnaplo/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file("filc3.properties")
+def keystorePropertiesFile = rootProject.file("key.properties")
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
@@ -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,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" package="hu.filc.naplo">
-    <application android:label="reFilc" tools:replace="android:label" android:icon="@mipmap/ic_launcher"
+    xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo">
+    <application android:name="${applicationName}" android:label="reFilc" tools:replace="android:label" android:icon="@mipmap/ic_launcher"
         android:requestLegacyExternalStorage="true">
         <activity android:exported="true" android:name=".MainActivity"
             android:launchMode="singleTop" android:theme="@style/LaunchTheme"
@@ -62,6 +62,7 @@
     <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.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" />

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

@@ -1,18 +1,9 @@
-package hu.filc.naplo;
-
-import android.os.Bundle;
+package hu.refilc.naplo;
 
 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/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/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/android/build.gradle

@@ -13,7 +13,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

filcnaplo/android/filc3.properties

@@ -1,4 +0,0 @@
-storePassword=filc3fix
-keyPassword=filc3fix
-keyAlias=upload
-storeFile=C:/Users/Peti/upload-keystore.jks

filcnaplo/build-ipa.sh

@@ -0,0 +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/build.sh

@@ -1,13 +1,3 @@
-#!/usr/bin/env fish
+#!/bin/sh
 
-# With build number
-function get_version_bn
-  cat pubspec.yaml | grep version: | cut -d' ' -f2
-end
-
-function get_version
-  cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1
-end
-
-flutter build apk --release --dart-define=APPVER=(get_version) --no-tree-shake-icons && \
-    cp -v "build/app/outputs/flutter-apk/app-release.apk" ~/"Desktop/hu.filc.naplo_"(get_version_bn).apk
+flutter build apk --release --dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1) --no-tree-shake-icons

filcnaplo/ios/Flutter/Generated 2.xcconfig

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

filcnaplo/ios/Podfile.lock

@@ -77,6 +77,8 @@ PODS:
   - Mantle/extobjc (2.2.0)
   - open_file (0.0.1):
     - Flutter
+  - package_info_plus (0.4.5):
+    - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -120,6 +122,7 @@ DEPENDENCIES:
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - live_activities (from `.symlinks/plugins/live_activities/ios`)
   - open_file (from `.symlinks/plugins/open_file/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - quick_actions_ios (from `.symlinks/plugins/quick_actions_ios/ios`)
@@ -171,6 +174,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/live_activities/ios"
   open_file:
     :path: ".symlinks/plugins/open_file/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
@@ -199,7 +204,7 @@ SPEC CHECKSUMS:
   connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95
+  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_custom_tabs: 7a10a08686955cb748e5d26e0ae586d30689bf89
   flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433
@@ -213,13 +218,14 @@ SPEC CHECKSUMS:
   live_activities: 9ff56a06a2d43ecd68f56deeed13b18a8304789c
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
   open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
+  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
   permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
   quick_actions_ios: 9e80dcfadfbc5d47d9cf8f47bcf428b11cf383d4
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
   SDWebImageWebPCoder: 18503de6621dd2c420d680e33d46bf8e1d5169b0
-  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
+  share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a

filcnaplo/ios/Runner.xcodeproj/project.pbxproj

@@ -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.refilc.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.refilc.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.refilc.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.refilc.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.refilc.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.refilc.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

filcnaplo/ios/Runner/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-		<string>Filc Napló</string>
+	<string>reFilc</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>

filcnaplo/ios/Runner/Runner.entitlements

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

filcnaplo/ios/livecard/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,6 +1,7 @@
 {
   "images" : [
     {
+      "filename" : "reFilc_Logo.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

filcnaplo/ios/livecard/Info.plist

@@ -7,5 +7,7 @@
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.widgetkit-extension</string>
 	</dict>
+	<key>NSSupportsLiveActivities</key>
+    <true/>
 </dict>
 </plist>

filcnaplo/ios/livecard/lesson_model.swift

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

filcnaplo/ios/livecard/livecard.entitlements

@@ -3,6 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.security.application-groups</key>
-	<array/>
+	<array>
+		<string>group.refilcnaplo.livecard</string>
+	</array>
 </dict>
 </plist>

filcnaplo/ios/livecard/livecard.swift

@@ -68,8 +68,6 @@ struct LockScreenLiveActivityView: View {
           .monospacedDigit()
           .padding(.trailing, CGFloat(24))
     }
-    .activitySystemActionForegroundColor(.teal)
-    .activityBackgroundTint(.teal)
   }
 }
 

filcnaplo/lib/api/client.dart

@@ -7,23 +7,24 @@ import 'package:filcnaplo/models/release.dart';
 import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/models/supporter.dart';
 import 'package:filcnaplo_kreta_api/models/school.dart';
+import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
 import 'package:connectivity_plus/connectivity_plus.dart';
 
 class FilcAPI {
   // Public API
-  static const schoolList = "https://filcnaplo.hu/v2/school_list.json";
-  static const news = "https://filcnaplo.hu/v2/news.json";
-  static const supporters = "https://api.filcnaplo.hu/sponsors";
+  static const schoolList = "https://api.refilc.hu/v1/public/school-list";
+  static const news = "https://api.refilc.hu/v1/public/news";
+  static const supporters = "https://api.refilc.hu/v1/public/supporters";
 
   // Private API
-  static const config = "https://api.filcnaplo.hu/config";
-  static const reportApi = "https://api.filcnaplo.hu/report";
+  static const config = "https://api.refilc.hu/v1/private/config";
+  static const reportApi = "https://api.refilc.hu/v1/private/crash-report";
   static const premiumApi = "https://api.filcnaplo.hu/premium/activate";
   // static const premiumScopesApi = "https://api.filcnaplo.hu/premium/scopes";
 
   // Updates
-  static const repo = "filc/naplo";
+  static const repo = "refilc/naplo";
   static const releases = "https://api.github.com/repos/$repo/releases";
 
   static Future<bool> checkConnectivity() async =>
@@ -68,6 +69,9 @@ class FilcAPI {
       http.Response res = await http.get(Uri.parse(config), headers: headers);
 
       if (res.statusCode == 200) {
+        if (kDebugMode) {
+          print(jsonDecode(res.body));
+        }
         return Config.fromJson(jsonDecode(res.body));
       } else if (res.statusCode == 429) {
         res = await http.get(Uri.parse(config));

filcnaplo/lib/api/login.dart

@@ -21,11 +21,20 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:filcnaplo/api/nonce.dart';
 
-enum LoginState { missingFields, invalidGrant, failed, normal, inProgress, success }
+enum LoginState {
+  missingFields,
+  invalidGrant,
+  failed,
+  normal,
+  inProgress,
+  success
+}
 
 Nonce getNonce(String nonce, String username, String instituteCode) {
-  Nonce nonceEncoder = Nonce(key: [98, 97, 83, 115, 120, 79, 119, 108, 85, 49, 106, 77], nonce: nonce);
-  nonceEncoder.encode(instituteCode.toUpperCase() + nonce + username.toUpperCase());
+  Nonce nonceEncoder = Nonce(
+      key: [98, 97, 83, 115, 120, 79, 119, 108, 85, 49, 106, 77], nonce: nonce);
+  nonceEncoder
+      .encode(instituteCode.toUpperCase() + nonce + username.toUpperCase());
 
   return nonceEncoder;
 }
@@ -38,18 +47,15 @@ Future loginApi({
   void Function(User)? onLogin,
   void Function()? onSuccess,
 }) async {
-  Provider.of<KretaClient>(context, listen: false).userAgent = Provider.of<SettingsProvider>(context, listen: false).config.userAgent;
+  Provider.of<KretaClient>(context, listen: false).userAgent =
+      Provider.of<SettingsProvider>(context, listen: false).config.userAgent;
 
   Map<String, String> headers = {
     "content-type": "application/x-www-form-urlencoded",
   };
 
-  String nonceStr = await Provider.of<KretaClient>(context, listen: false).getAPI(KretaAPI.nonce, json: false);
-
-  Nonce nonce = getNonce(nonceStr, username, instituteCode);
-  headers.addAll(nonce.header());
-
-  Map? res = await Provider.of<KretaClient>(context, listen: false).postAPI(KretaAPI.login,
+  Map? res = await Provider.of<KretaClient>(context, listen: false)
+      .postAPI(KretaAPI.login,
           headers: headers,
           body: User.loginBody(
             username: username,
@@ -64,8 +70,11 @@ Future loginApi({
     } else {
       if (res.containsKey("access_token")) {
         try {
-          Provider.of<KretaClient>(context, listen: false).accessToken = res["access_token"];
-          Map? studentJson = await Provider.of<KretaClient>(context, listen: false).getAPI(KretaAPI.student(instituteCode));
+          Provider.of<KretaClient>(context, listen: false).accessToken =
+              res["access_token"];
+          Map? studentJson =
+              await Provider.of<KretaClient>(context, listen: false)
+                  .getAPI(KretaAPI.student(instituteCode));
           Student student = Student.fromJson(studentJson!);
           var user = User(
             username: username,
@@ -79,7 +88,9 @@ Future loginApi({
           if (onLogin != null) onLogin(user);
 
           // Store User in the database
-          await Provider.of<DatabaseProvider>(context, listen: false).store.storeUser(user);
+          await Provider.of<DatabaseProvider>(context, listen: false)
+              .store
+              .storeUser(user);
           Provider.of<UserProvider>(context, listen: false).addUser(user);
           Provider.of<UserProvider>(context, listen: false).setUser(user.id);
 
@@ -87,7 +98,8 @@ Future loginApi({
           try {
             await Future.wait([
               Provider.of<GradeProvider>(context, listen: false).fetch(),
-              Provider.of<TimetableProvider>(context, listen: false).fetch(week: Week.current()),
+              Provider.of<TimetableProvider>(context, listen: false)
+                  .fetch(week: Week.current()),
               Provider.of<ExamProvider>(context, listen: false).fetch(),
               Provider.of<HomeworkProvider>(context, listen: false).fetch(),
               Provider.of<MessageProvider>(context, listen: false).fetchAll(),

filcnaplo/lib/api/providers/database_provider.dart

@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:filcnaplo/database/query.dart';
 import 'package:filcnaplo/database/store.dart';
-import 'package:sqflite/sqflite.dart';
 // ignore: depend_on_referenced_packages
 import 'package:sqflite_common_ffi/sqflite_ffi.dart';