new version

Analytics

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pub" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.gitignore

@@ -1,5 +1,7 @@
 # See https://www.dartlang.org/guides/libraries/private-files
 
+termek.txt
+
 # Files and directories created by pub
 .dart_tool/
 .packages
@@ -19,3 +21,5 @@ doc/api/
 *.js_
 *.js.deps
 *.js.map
+
+*.txt

.vscode/launch.json

@@ -8,7 +8,10 @@
       "name": "filcnaplo",
       "cwd": "filcnaplo",
       "request": "launch",
-      "type": "dart"
+      "type": "dart",
+      "toolArgs": [
+        "--dart-define=APPVER=$(cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1)"
+      ]
     }
   ]
 }

README.md

@@ -9,16 +9,16 @@
 
 ## Setup
 
-### Clone the project:
+### Clone the project
 
-```
+```sh
-$ git clone --recursive https://github.com/filc/naplo
+git clone --recursive https://github.com/filc/naplo
-$ cd naplo
+cd naplo
 ```
 
-### Run the app:
+### Run the app
 
-```
+```sh
-$ cd filcnaplo
+cd filcnaplo
-$ flutter run
+flutter run
 ```

changelog.md

@@ -0,0 +1,3 @@
+What's new:
+
+- Hibajavítások

filcnaplo/.gitignore

@@ -8,7 +8,6 @@
 .buildlog/
 .history
 .svn/
-build.sh
 
 # IntelliJ related
 *.iml

filcnaplo/analysis_options.yaml

@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

filcnaplo/android/.gitignore

@@ -9,3 +9,4 @@ GeneratedPluginRegistrant.java
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+.project

filcnaplo/android/app/build.gradle

@@ -52,6 +52,7 @@ android {
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
 
     signingConfigs {
@@ -77,6 +78,7 @@ flutter {
 }
 
 dependencies {
+    implementation 'com.android.support:multidex:2.0.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'

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

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="hu.filc.naplo">
   <application android:label="Filc Napló" android:icon="@mipmap/ic_launcher" android:requestLegacyExternalStorage="true">
-    <activity android:name=".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">
+    <activity android:exported="true" android:name=".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">
       <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>

filcnaplo/android/build.gradle

@@ -1,9 +1,9 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
 
     ext {
-        compileSdkVersion   = 30
+        compileSdkVersion   = 31
-        targetSdkVersion    = 30
+        targetSdkVersion    = 31
         appCompatVersion    = "1.1.0"
     }
 
@@ -13,7 +13,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -33,8 +33,8 @@ subprojects {
     afterEvaluate {project ->
         if (project.plugins.hasPlugin('android') || project.plugins.hasPlugin('android-library')) {
             android {
-                compileSdkVersion 30
+                compileSdkVersion 31
-                buildToolsVersion '30.0.3'
+                buildToolsVersion '31.0.0'
             }
         }
     }

filcnaplo/assets/icons/home.svg

@@ -1,5 +0,0 @@
-<svg width="20" height="22" viewBox="0 0 20 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path
-    d="M1 8L10 1L19 8V19C19 19.5304 18.7893 20.0391 18.4142 20.4142C18.0391 20.7893 17.5304 21 17 21H3C2.46957 21 1.96086 20.7893 1.58579 20.4142C1.21071 20.0391 1 19.5304 1 19V8Z"
-    stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
-</svg>

filcnaplo/assets/icons/linux.svg

@@ -1,3 +0,0 @@
-<svg width="288" height="288" viewBox="0 0 288 288" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M159.653 207.26C136.598 217.973 115.171 217.858 100.771 216.821C83.6064 215.583 69.7824 210.888 63.72 206.77C59.976 204.236 54.8928 205.215 52.3584 208.959C49.824 212.703 50.8032 217.786 54.5472 220.32C64.3104 226.93 81.5616 231.84 99.5904 233.136C102.643 233.367 105.998 233.496 109.613 233.496C125.309 233.496 145.238 231.999 166.55 222.092C170.64 220.176 172.426 215.324 170.51 211.22C168.61 207.13 163.742 205.344 159.653 207.26ZM250.574 195.135C251.352 124.057 258.667 -10.2371 122.616 0.620487C-11.7072 11.4348 23.904 153.332 21.9024 200.852C20.1312 225.994 11.7936 256.723 0 288H36.3024C40.0464 274.752 42.7824 261.634 43.9632 249.149C46.152 250.675 48.4992 252.144 51.0048 253.555C55.0656 255.96 58.5648 259.143 62.2656 262.512C70.9056 270.389 80.712 279.331 99.864 280.44C101.146 280.512 102.442 280.555 103.709 280.555C123.091 280.555 136.339 272.074 146.995 265.263C152.093 261.994 156.499 259.171 160.646 257.818C172.44 254.131 182.736 248.17 190.426 240.595C191.635 239.415 192.744 238.191 193.795 236.952C198.086 252.663 203.962 270.36 210.47 288H288C269.366 259.258 250.171 231.077 250.574 195.135ZM34.9056 156.471V156.457C33.5664 133.258 44.6688 113.761 59.688 112.882C74.7072 112.004 87.9696 130.105 89.3088 153.289C89.3088 153.303 89.3088 153.303 89.3088 153.303C89.3808 154.556 89.4096 155.794 89.4096 157.018C84.6576 158.213 80.352 159.956 76.5072 161.986C76.4928 161.813 76.4784 161.641 76.464 161.468V161.453C75.1824 148.292 68.1552 138.356 60.7536 139.249C53.3664 140.156 48.4128 151.561 49.7088 164.722C50.2704 170.468 51.912 175.594 54.216 179.482C53.64 179.929 52.0272 181.109 50.1696 182.477C48.7728 183.5 47.0592 184.738 45.0144 186.25C39.4272 178.906 35.5968 168.365 34.9056 156.471ZM187.099 213.797C186.566 226.051 170.525 237.586 155.722 242.208L155.635 242.237C149.472 244.239 143.986 247.752 138.168 251.467C128.405 257.717 118.296 264.183 103.709 264.183C102.744 264.183 101.765 264.154 100.8 264.096C87.4368 263.319 81.1872 257.631 73.2816 250.416C69.1056 246.615 64.7856 242.669 59.2272 239.415L59.0976 239.343C47.088 232.56 39.6288 224.136 39.1536 216.778C38.9232 213.135 40.5504 209.967 43.992 207.389C51.48 201.773 56.5056 198.101 59.8176 195.668C63.504 192.975 64.6272 192.168 65.448 191.376C66.0384 190.829 66.672 190.21 67.3632 189.533C74.232 182.852 85.7376 171.663 103.406 171.663C114.206 171.663 126.158 175.825 138.888 184.004C144.878 187.906 150.106 189.706 156.715 191.996C161.251 193.565 166.406 195.336 173.304 198.288L173.419 198.346C179.842 200.981 187.445 205.805 187.099 213.783V213.797ZM183.557 184.997C182.318 184.378 181.022 183.788 179.683 183.226C173.462 180.576 168.48 178.762 164.347 177.322C166.637 172.858 168.048 167.285 168.178 161.223C168.494 146.492 161.064 134.525 151.589 134.511C142.099 134.482 134.165 146.405 133.848 161.137C133.834 161.626 133.834 162.101 133.848 162.577C128.002 159.898 122.256 157.94 116.64 156.745C116.611 156.183 116.582 155.636 116.568 155.074V155.06C116.021 128.233 132.494 106.014 153.346 105.452C174.197 104.89 191.549 126.174 192.096 153.015V153.029C192.341 165.169 189.101 176.329 183.557 184.997Z" fill="black"/>
-</svg>

filcnaplo/build.sh

@@ -0,0 +1,19 @@
+#!/bin/fish
+
+# 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
+
+if test -e /mnt/enc/keys/filc3.properties
+  set -x ANDROID_SIGNING /mnt/enc/keys/filc3.properties
+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
+
+notify-send "Flutter" "Apk build done."

filcnaplo/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

filcnaplo/ios/Flutter/Debug.xcconfig

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

filcnaplo/ios/Flutter/Release.xcconfig

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

filcnaplo/ios/Podfile

@@ -0,0 +1,43 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '11.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+
+  pod 'DKImagePickerController/PhotoGallery', :git => 'https://github.com/zhangao0086/DKImagePickerController.git'
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_ios_build_settings(target)
+  end
+end

filcnaplo/ios/Podfile.lock

@@ -0,0 +1,140 @@
+PODS:
+  - 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
+  - FMDB (2.7.5):
+    - FMDB/standard (= 2.7.5)
+  - FMDB/standard (2.7.5)
+  - open_file (0.0.1):
+    - Flutter
+  - path_provider_ios (0.0.1):
+    - Flutter
+  - 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)
+  - share_plus (0.0.1):
+    - Flutter
+  - sqflite (0.0.2):
+    - Flutter
+    - FMDB (>= 2.7.5)
+  - SwiftyGif (5.4.3)
+  - url_launcher_ios (0.0.1):
+    - Flutter
+
+DEPENDENCIES:
+  - 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`)
+  - open_file (from `.symlinks/plugins/open_file/ios`)
+  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+  - 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`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+
+SPEC REPOS:
+  trunk:
+    - DKPhotoGallery
+    - FMDB
+    - ReachabilitySwift
+    - SDWebImage
+    - SwiftyGif
+
+EXTERNAL SOURCES:
+  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"
+  open_file:
+    :path: ".symlinks/plugins/open_file/ios"
+  path_provider_ios:
+    :path: ".symlinks/plugins/path_provider_ios/ios"
+  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"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
+
+CHECKOUT OPTIONS:
+  DKImagePickerController:
+    :commit: a727e44718a67e300089174e5591166045815ba4
+    :git: https://github.com/zhangao0086/DKImagePickerController.git
+
+SPEC CHECKSUMS:
+  connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
+  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
+  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
+  file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  flutter_custom_tabs: 7a10a08686955cb748e5d26e0ae586d30689bf89
+  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
+  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
+  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
+  quick_actions_ios: 5ec8f5f1ae81512ac803fe10c197ebb875767a9e
+  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
+  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
+  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+  SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
+  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
+
+PODFILE CHECKSUM: 862f939bb7e5390bdb8b2534eb81a9457ea9fbdc
+
+COCOAPODS: 1.11.3

filcnaplo/ios/Runner.xcodeproj/project.pbxproj

@@ -3,11 +3,12 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		373A6ECB5FC71FE9D8AF2EDB /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F0ADD56276103500A3016C8 /* Pods_Runner.framework */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -31,10 +32,13 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		1F0ADD56276103500A3016C8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		707F8089D970F81C480F73C4 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		80777CF254888CE770D5F909 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -42,6 +46,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		98578F0EBCC6D3FF8391AAEB /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -49,12 +54,31 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				373A6ECB5FC71FE9D8AF2EDB /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		6640A963014A9D4F31026053 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1F0ADD56276103500A3016C8 /* Pods_Runner.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		91FEB6212755D596FFFFEC73 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				80777CF254888CE770D5F909 /* Pods-Runner.debug.xcconfig */,
+				98578F0EBCC6D3FF8391AAEB /* Pods-Runner.release.xcconfig */,
+				707F8089D970F81C480F73C4 /* Pods-Runner.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -72,6 +96,8 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
+				91FEB6212755D596FFFFEC73 /* Pods */,
+				6640A963014A9D4F31026053 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -105,12 +131,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				779338C8D92BCBC36F75F791 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				71459C0EB905E05018E3D78F /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -127,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -183,6 +211,45 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		71459C0EB905E05018E3D78F /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		779338C8D92BCBC36F75F791 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -254,6 +321,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -272,7 +340,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -290,7 +358,10 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = hu.filc.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -322,6 +393,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -346,7 +418,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -377,6 +449,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -395,10 +468,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -414,7 +488,10 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = hu.filc.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -433,7 +510,10 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = hu.filc.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

filcnaplo/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
+      <Testables>
-      </AdditionalOptions>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"

filcnaplo/ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>

filcnaplo/ios/Runner/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

filcnaplo/ios/Runner/Assets.xcassets/ic_absences.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

filcnaplo/ios/Runner/Assets.xcassets/ic_grades.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

filcnaplo/ios/Runner/Assets.xcassets/ic_messages.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

filcnaplo/ios/Runner/Assets.xcassets/ic_timetable.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "icon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

filcnaplo/ios/Runner/Info.plist

@@ -50,5 +50,9 @@
     </array>
     <key>NSPhotoLibraryUsageDescription</key>
     <string>The app requires the photo library to set a custom profile picture.</string>
-  </dict>
+    <key>ITSAppUsesNonExemptEncryption</key>
+    <false/>
+  	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+</dict>
 </plist>

filcnaplo/lib/api/client.dart

@@ -1,51 +1,84 @@
+// ignore_for_file: avoid_print
+
 import 'dart:convert';
+import 'dart:developer';
 
 import 'package:filcnaplo/models/config.dart';
 import 'package:filcnaplo/models/news.dart';
 import 'package:filcnaplo/models/release.dart';
+import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/models/supporter.dart';
 import 'package:filcnaplo_kreta_api/models/school.dart';
 import 'package:http/http.dart' as http;
+import 'package:connectivity_plus/connectivity_plus.dart';
 
 class FilcAPI {
-  static const SCHOOL_LIST = "https://filcnaplo.hu/v2/school_list.json";
+  // Public API
-  static const CONFIG = "https://filcnaplo.hu/v2/config.json";
+  static const schoolList = "https://filcnaplo.hu/v2/school_list.json";
-  static const NEWS = "https://filcnaplo.hu/v2/news.json";
+  static const news = "https://filcnaplo.hu/v2/news.json";
-  static const SUPPORTERS = "https://filcnaplo.hu/v2/supporters.json";
+  static const supporters = "https://filcnaplo.hu/v2/supporters.json";
-  static const REPO = "filc/naplo";
+
-  static const RELEASES = "https://api.github.com/repos/$REPO/releases";
+  // Private API
+  static const config = "https://api.filcnaplo.hu/config";
+  static const reportApi = "https://api.filcnaplo.hu/report";
+
+  // Updates
+  static const repo = "filc/naplo";
+  static const releases = "https://api.github.com/repos/$repo/releases";
+
+  static Future<bool> checkConnectivity() async => (await Connectivity().checkConnectivity()) != ConnectivityResult.none;
 
   static Future<List<School>?> getSchools() async {
     try {
-      http.Response res = await http.get(Uri.parse(SCHOOL_LIST));
+      http.Response res = await http.get(Uri.parse(schoolList));
 
       if (res.statusCode == 200) {
-        return (jsonDecode(res.body) as List).cast<Map>().map((json) => School.fromJson(json)).toList();
+        List<School> schools = (jsonDecode(res.body) as List).cast<Map>().map((json) => School.fromJson(json)).toList();
+        schools.add(School(
+          city: "Tiszabura",
+          instituteCode: "supporttest-reni-tiszabura-teszt01",
+          name: "FILC Éles Reni tiszabura-teszt",
+        ));
+        return schools;
       } else {
         throw "HTTP ${res.statusCode}: ${res.body}";
       }
     } catch (error) {
       print("ERROR: FilcAPI.getSchools: $error");
     }
+    return null;
   }
 
-  static Future<Config?> getConfig() async {
+  static Future<Config?> getConfig(SettingsProvider settings) async {
+    final userAgent = SettingsProvider.defaultSettings().config.userAgent;
+
+    Map<String, String> headers = {
+      "x-filc-id": settings.xFilcId,
+      "user-agent": userAgent,
+    };
+
+    log("[CONFIG] x-filc-id: \"${settings.xFilcId}\"");
+    log("[CONFIG] user-agent: \"$userAgent\"");
+
     try {
-      http.Response res = await http.get(Uri.parse(CONFIG));
+      http.Response res = await http.get(Uri.parse(config), headers: headers);
 
       if (res.statusCode == 200) {
         return Config.fromJson(jsonDecode(res.body));
-      } else {
+      } else if (res.statusCode == 429) {
-        throw "HTTP ${res.statusCode}: ${res.body}";
+        res = await http.get(Uri.parse(config));
+        if (res.statusCode == 200) return Config.fromJson(jsonDecode(res.body));
       }
+      throw "HTTP ${res.statusCode}: ${res.body}";
     } catch (error) {
       print("ERROR: FilcAPI.getConfig: $error");
     }
+    return null;
   }
 
   static Future<List<News>?> getNews() async {
     try {
-      http.Response res = await http.get(Uri.parse(NEWS));
+      http.Response res = await http.get(Uri.parse(news));
 
       if (res.statusCode == 200) {
         return (jsonDecode(res.body) as List).cast<Map>().map((e) => News.fromJson(e)).toList();
@@ -55,11 +88,12 @@ class FilcAPI {
     } catch (error) {
       print("ERROR: FilcAPI.getNews: $error");
     }
+    return null;
   }
 
   static Future<Supporters?> getSupporters() async {
     try {
-      http.Response res = await http.get(Uri.parse(SUPPORTERS));
+      http.Response res = await http.get(Uri.parse(supporters));
 
       if (res.statusCode == 200) {
         return Supporters.fromJson(jsonDecode(res.body));
@@ -69,11 +103,12 @@ class FilcAPI {
     } catch (error) {
       print("ERROR: FilcAPI.getSupporters: $error");
     }
+    return null;
   }
 
   static Future<List<Release>?> getReleases() async {
     try {
-      http.Response res = await http.get(Uri.parse(RELEASES));
+      http.Response res = await http.get(Uri.parse(releases));
 
       if (res.statusCode == 200) {
         return (jsonDecode(res.body) as List).cast<Map>().map((e) => Release.fromJson(e)).toList();
@@ -83,10 +118,11 @@ class FilcAPI {
     } catch (error) {
       print("ERROR: FilcAPI.getReleases: $error");
     }
+    return null;
   }
 
   static Future<http.StreamedResponse?> downloadRelease(Release release) {
-    if (release.downloads.length > 0) {
+    if (release.downloads.isNotEmpty) {
       try {
         var client = http.Client();
         var request = http.Request('GET', Uri.parse(release.downloads.first));
@@ -98,4 +134,35 @@ class FilcAPI {
 
     return Future.value(null);
   }
+
+  static Future<void> sendReport(ErrorReport report) async {
+    try {
+      http.Response res = await http.post(Uri.parse(reportApi), body: {
+        "os": report.os,
+        "version": report.version,
+        "error": report.error,
+        "stack_trace": report.stack,
+      });
+
+      if (res.statusCode != 200) {
+        throw "HTTP ${res.statusCode}: ${res.body}";
+      }
+    } catch (error) {
+      print("ERROR: FilcAPI.sendReport: $error");
+    }
+  }
+}
+
+class ErrorReport {
+  String stack;
+  String os;
+  String version;
+  String error;
+
+  ErrorReport({
+    required this.stack,
+    required this.os,
+    required this.version,
+    required this.error,
+  });
 }

filcnaplo/lib/api/login.dart

@@ -1,3 +1,6 @@
+// ignore_for_file: avoid_print, use_build_context_synchronously
+
+import 'package:filcnaplo/utils/jwt.dart';
 import 'package:filcnaplo_kreta_api/providers/absence_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/event_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/exam_provider.dart';
@@ -10,10 +13,8 @@ import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/api/providers/database_provider.dart';
 import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/models/user.dart';
-import 'package:filcnaplo/utils/jwt.dart';
 import 'package:filcnaplo_kreta_api/client/api.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
-import 'package:filcnaplo_kreta_api/models/message.dart';
 import 'package:filcnaplo_kreta_api/models/student.dart';
 import 'package:filcnaplo_kreta_api/models/week.dart';
 import 'package:flutter/material.dart';
@@ -23,8 +24,8 @@ import 'package:filcnaplo/api/nonce.dart';
 enum LoginState { missingFields, invalidGrant, failed, normal, inProgress, success }
 
 Nonce getNonce(BuildContext context, String nonce, String username, String instituteCode) {
-  Nonce nonceEncoder = Nonce(key: [53, 75, 109, 112, 109, 103, 100, 53, 102, 74], nonce: nonce);
+  Nonce nonceEncoder = Nonce(key: [98, 97, 83, 115, 120, 79, 119, 108, 85, 49, 106, 77], nonce: nonce);
-  nonceEncoder.encode(username.toLowerCase() + instituteCode.toLowerCase() + nonce);
+  nonceEncoder.encode(instituteCode.toUpperCase() + nonce + username.toUpperCase());
 
   return nonceEncoder;
 }
@@ -65,12 +66,14 @@ Future loginApi({
         try {
           Provider.of<KretaClient>(context, listen: false).accessToken = res["access_token"];
           Map? studentJson = await Provider.of<KretaClient>(context, listen: false).getAPI(KretaAPI.student(instituteCode));
+          Student student = Student.fromJson(studentJson!);
           var user = User(
             username: username,
             password: password,
             instituteCode: instituteCode,
-            name: JwtUtils.getNameFromJWT(res["access_token"]) ?? "?",
+            name: student.name,
-            student: Student.fromJson(studentJson!),
+            student: student,
+            role: JwtUtils.getRoleFromJWT(res["access_token"])!,
           );
 
           if (onLogin != null) onLogin(user);
@@ -82,14 +85,16 @@ Future loginApi({
 
           // Get user data
           try {
-            await Provider.of<GradeProvider>(context, listen: false).fetch();
+            await Future.wait([
-            await Provider.of<TimetableProvider>(context, listen: false).fetch(week: Week.current());
+              Provider.of<GradeProvider>(context, listen: false).fetch(),
-            await Provider.of<ExamProvider>(context, listen: false).fetch();
+              Provider.of<TimetableProvider>(context, listen: false).fetch(week: Week.current()),
-            await Provider.of<HomeworkProvider>(context, listen: false).fetch();
+              Provider.of<ExamProvider>(context, listen: false).fetch(),
-            await Provider.of<MessageProvider>(context, listen: false).fetch(type: MessageType.inbox);
+              Provider.of<HomeworkProvider>(context, listen: false).fetch(),
-            await Provider.of<NoteProvider>(context, listen: false).fetch();
+              Provider.of<MessageProvider>(context, listen: false).fetchAll(),
-            await Provider.of<EventProvider>(context, listen: false).fetch();
+              Provider.of<NoteProvider>(context, listen: false).fetch(),
-            await Provider.of<AbsenceProvider>(context, listen: false).fetch();
+              Provider.of<EventProvider>(context, listen: false).fetch(),
+              Provider.of<AbsenceProvider>(context, listen: false).fetch(),
+            ]);
           } catch (error) {
             print("WARNING: failed to fetch user data: $error");
           }

filcnaplo/lib/api/nonce.dart

@@ -19,7 +19,7 @@ class Nonce {
     return {
       "X-Authorizationpolicy-Nonce": nonce,
       "X-Authorizationpolicy-Key": encoded ?? "",
-      "X-Authorizationpolicy-Version": "v1",
+      "X-Authorizationpolicy-Version": "v2",
     };
   }
 }

filcnaplo/lib/api/providers/database_provider.dart

@@ -1,6 +1,10 @@
+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';
 
 class DatabaseProvider {
   // late Database _database;
@@ -10,8 +14,14 @@ class DatabaseProvider {
   late UserDatabaseStore userStore;
 
   Future<void> init() async {
-    var db = await openDatabase("app.db");
+    Database db;
-    // _database = db;
+
+    if (Platform.isLinux || Platform.isWindows) {
+      db = await databaseFactoryFfi.openDatabase("app.db");
+    } else {
+      db = await openDatabase("app.db");
+    }
+
     query = DatabaseQuery(db: db);
     store = DatabaseStore(db: db);
     userQuery = UserDatabaseQuery(db: db);

filcnaplo/lib/api/providers/news_provider.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: use_build_context_synchronously
+
 import 'dart:math';
 
 import 'package:filcnaplo/api/client.dart';
@@ -72,10 +74,11 @@ class NewsProvider extends ChangeNotifier {
 
     Provider.of<SettingsProvider>(_context, listen: false).update(_context, newsState: _state);
 
-    if (_fresh > 0)
+    if (_fresh > 0) {
       show = true;
-    else
+    } else {
       show = false;
+    }
 
     notifyListeners();
   }

filcnaplo/lib/api/providers/status_provider.dart

@@ -0,0 +1,75 @@
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:flutter/widgets.dart';
+import 'package:http/http.dart' as http;
+
+enum Status { network, maintenance, syncing }
+
+class StatusProvider extends ChangeNotifier {
+  final List<Status> _stack = [];
+  double _progress = 0.0;
+
+  StatusProvider() {
+    _handleNetworkChanges();
+  }
+
+  Status? getStatus() => _stack.isNotEmpty ? _stack[0] : null;
+  // Status progress from 0.0 to 1.0
+  double get progress => _progress;
+
+  void _handleNetworkChanges() {
+    Connectivity().onConnectivityChanged.listen((event) {
+      if (event == ConnectivityResult.none) {
+        if (!_stack.contains(Status.network)) {
+          _stack.insert(0, Status.network);
+          notifyListeners();
+        }
+      } else {
+        if (_stack.contains(Status.network)) {
+          _stack.remove(Status.network);
+          notifyListeners();
+        }
+      }
+    });
+  }
+
+  void triggerRequest(http.Response res) {
+    if (res.headers.containsKey("x-maintenance-mode") || res.statusCode == 503) {
+      if (!_stack.contains(Status.maintenance)) {
+        _stack.insert(0, Status.maintenance);
+        notifyListeners();
+      }
+    } else {
+      if (_stack.contains(Status.maintenance)) {
+        _stack.remove(Status.maintenance);
+        notifyListeners();
+      }
+    }
+  }
+
+  void triggerSync({required int current, required int max}) {
+    double prev = _progress;
+
+    if (!_stack.contains(Status.syncing)) {
+      _stack.add(Status.syncing);
+      _progress = 0.0;
+      notifyListeners();
+    }
+
+    if (max == 0) {
+      _progress = 0.0;
+    } else {
+      _progress = current / max;
+    }
+
+    if (_progress == 1.0) {
+      notifyListeners();
+      // Wait for animation
+      Future.delayed(const Duration(milliseconds: 250), () {
+        _stack.remove(Status.syncing);
+        notifyListeners();
+      });
+    } else if (progress != prev) {
+      notifyListeners();
+    }
+  }
+}

filcnaplo/lib/api/providers/sync.dart

@@ -0,0 +1,71 @@
+// ignore_for_file: use_build_context_synchronously
+
+import 'package:filcnaplo/api/providers/database_provider.dart';
+import 'package:filcnaplo/api/providers/status_provider.dart';
+import 'package:filcnaplo/api/providers/user_provider.dart';
+import 'package:filcnaplo_kreta_api/client/api.dart';
+import 'package:filcnaplo_kreta_api/client/client.dart';
+import 'package:filcnaplo_kreta_api/models/student.dart';
+import 'package:filcnaplo_kreta_api/models/week.dart';
+import 'package:filcnaplo_kreta_api/providers/absence_provider.dart';
+import 'package:filcnaplo_kreta_api/providers/event_provider.dart';
+import 'package:filcnaplo_kreta_api/providers/exam_provider.dart';
+import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
+import 'package:filcnaplo_kreta_api/providers/homework_provider.dart';
+import 'package:filcnaplo_kreta_api/providers/message_provider.dart';
+import 'package:filcnaplo_kreta_api/providers/note_provider.dart';
+import 'package:filcnaplo_kreta_api/providers/timetable_provider.dart';
+import 'package:flutter/widgets.dart';
+import 'package:provider/provider.dart';
+
+// Mutex
+bool lock = false;
+
+Future<void> syncAll(BuildContext context) {
+  if (lock) return Future.value();
+  // Lock
+  lock = true;
+
+  // ignore: avoid_print
+  print("INFO Syncing all");
+
+  UserProvider user = Provider.of<UserProvider>(context, listen: false);
+  StatusProvider statusProvider = Provider.of<StatusProvider>(context, listen: false);
+
+  List<Future<void>> tasks = [];
+  int taski = 0;
+
+  Future<void> syncStatus(Future<void> future) async {
+    await future.onError((error, stackTrace) => null);
+    taski++;
+    statusProvider.triggerSync(current: taski, max: tasks.length);
+  }
+
+  tasks = [
+    syncStatus(Provider.of<GradeProvider>(context, listen: false).fetch()),
+    syncStatus(Provider.of<TimetableProvider>(context, listen: false).fetch(week: Week.current())),
+    syncStatus(Provider.of<ExamProvider>(context, listen: false).fetch()),
+    syncStatus(Provider.of<HomeworkProvider>(context, listen: false).fetch(from: DateTime.now().subtract(const Duration(days: 30)))),
+    syncStatus(Provider.of<MessageProvider>(context, listen: false).fetchAll()),
+    syncStatus(Provider.of<NoteProvider>(context, listen: false).fetch()),
+    syncStatus(Provider.of<EventProvider>(context, listen: false).fetch()),
+    syncStatus(Provider.of<AbsenceProvider>(context, listen: false).fetch()),
+
+    // Sync student
+    syncStatus(() async {
+      if (user.user == null) return;
+      Map? studentJson = await Provider.of<KretaClient>(context, listen: false).getAPI(KretaAPI.student(user.instituteCode!));
+      if (studentJson == null) return;
+      Student student = Student.fromJson(studentJson);
+
+      user.user?.name = student.name;
+
+      // Store user
+      await Provider.of<DatabaseProvider>(context, listen: false).store.storeUser(user.user!);
+    }()),
+  ];
+
+  return Future.wait(tasks)
+      // Unlock
+      .then((value) => lock = false);
+}

filcnaplo/lib/api/providers/update_provider.dart

@@ -3,14 +3,12 @@ import 'dart:io';
 import 'package:filcnaplo/api/client.dart';
 import 'package:filcnaplo/models/release.dart';
 import 'package:flutter/material.dart';
-import 'package:package_info_plus/package_info_plus.dart';
 
 class UpdateProvider extends ChangeNotifier {
   // Private
   late List<Release> _releases;
   bool _available = false;
-  bool get available => _available && _releases.length > 0;
+  bool get available => _available && _releases.isNotEmpty;
-  PackageInfo? _packageInfo;
 
   // Public
   List<Release> get releases => _releases;
@@ -20,9 +18,10 @@ class UpdateProvider extends ChangeNotifier {
     required BuildContext context,
   }) {
     _releases = List.castFrom(initialReleases);
-    PackageInfo.fromPlatform().then((value) => _packageInfo = value);
   }
 
+  static const currentVersion = String.fromEnvironment("APPVER", defaultValue: "1.0");
+
   Future<void> fetch() async {
     if (!Platform.isAndroid) return;
 
@@ -30,8 +29,9 @@ class UpdateProvider extends ChangeNotifier {
     _releases.sort((a, b) => -a.version.compareTo(b.version));
 
     // Check for new releases
-    if (_releases.length > 0) {
+    if (_releases.isNotEmpty) {
-      _available = _packageInfo != null && _releases.first.version.compareTo(Version.fromString(_packageInfo?.version ?? "")) == 1;
+      _available = _releases.first.version.compareTo(Version.fromString(currentVersion)) == 1;
+      // ignore: avoid_print
       if (_available) print("INFO: New update: ${releases.first.version}");
       notifyListeners();
     }

filcnaplo/lib/api/providers/user_provider.dart

@@ -3,7 +3,7 @@ import 'package:filcnaplo_kreta_api/models/student.dart';
 import 'package:flutter/foundation.dart';
 
 class UserProvider with ChangeNotifier {
-  Map<String, User> _users = {};
+  final Map<String, User> _users = {};
   String? _selectedUserId;
   User? get user => _users[_selectedUserId];
 
@@ -13,6 +13,7 @@ class UserProvider with ChangeNotifier {
   String? get name => user?.name;
   String? get username => user?.username;
   String? get password => user?.password;
+  Role? get role => user?.role;
   Student? get student => user?.student;
 
   void setUser(String userId) {
@@ -22,7 +23,9 @@ class UserProvider with ChangeNotifier {
 
   void addUser(User user) {
     _users[user.id] = user;
-    print("DEBUG: Added User: ${user.id} ${user.name}");
+    if (kDebugMode) {
+      print("DEBUG: Added User: ${user.id}");
+    }
   }
 
   void removeUser(String userId) {

filcnaplo/lib/app.dart

@@ -1,8 +1,11 @@
+import 'dart:io';
 import 'dart:math';
 
+import 'package:dynamic_color/dynamic_color.dart';
 import 'package:filcnaplo/api/client.dart';
 import 'package:filcnaplo/api/providers/news_provider.dart';
 import 'package:filcnaplo/api/providers/database_provider.dart';
+import 'package:filcnaplo/api/providers/status_provider.dart';
 import 'package:filcnaplo/models/config.dart';
 import 'package:filcnaplo/theme.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
@@ -16,6 +19,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:i18n_extension/i18n_widget.dart';
+import 'package:material_color_utilities/palettes/core_palette.dart';
 import 'package:provider/provider.dart';
 
 // Providers
@@ -31,6 +35,7 @@ import 'package:filcnaplo_kreta_api/providers/timetable_provider.dart';
 import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/api/providers/update_provider.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/calculator/grade_calculator_provider.dart';
+import 'package:flutter_displaymode/flutter_displaymode.dart';
 
 class App extends StatelessWidget {
   final SettingsProvider settings;
@@ -38,25 +43,31 @@ class App extends StatelessWidget {
   final DatabaseProvider database;
 
   App({Key? key, required this.database, required this.settings, required this.user}) : super(key: key) {
-    if (user.getUsers().length > 0) user.setUser(user.getUsers().first.id);
+    if (user.getUsers().isNotEmpty) user.setUser(user.getUsers().first.id);
   }
 
   @override
   Widget build(BuildContext context) {
     setSystemChrome(context);
 
-    WidgetsBinding.instance?.addPostFrameCallback((_) {
+    // Set high refresh mode #28
-      FilcAPI.getConfig().then((Config? config) {
+    if (Platform.isAndroid) FlutterDisplayMode.setHighRefreshRate();
-        settings.update(context, database: database, config: config ?? Config.fromJson({}));
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      FilcAPI.getConfig(settings).then((Config? config) {
+        if (config != null) settings.update(context, database: database, config: config);
       });
     });
 
+    CorePalette? corePalette;
+
     return I18n(
       initialLocale: Locale(settings.language, settings.language.toUpperCase()),
       child: MultiProvider(
         providers: [
           ChangeNotifierProvider<SettingsProvider>(create: (_) => settings),
           ChangeNotifierProvider<UserProvider>(create: (_) => user),
+          ChangeNotifierProvider<StatusProvider>(create: (context) => StatusProvider()),
           Provider<KretaClient>(create: (context) => KretaClient(context: context, userAgent: settings.config.userAgent)),
           Provider<DatabaseProvider>(create: (context) => database),
           ChangeNotifierProvider<ThemeModeObserver>(create: (context) => ThemeModeObserver(initialTheme: settings.theme)),
@@ -77,6 +88,10 @@ class App extends StatelessWidget {
         ],
         child: Consumer<ThemeModeObserver>(
           builder: (context, themeMode, child) {
+            return FutureBuilder<CorePalette?>(
+              future: DynamicColorPlugin.getCorePalette(),
+              builder: (context, snapshot) {
+                corePalette = snapshot.data;
                 return MaterialApp(
                   builder: (context, child) {
                     // Limit font size scaling to 1.0
@@ -89,21 +104,21 @@ class App extends StatelessWidget {
                   },
                   title: "Filc Napló",
                   debugShowCheckedModeBanner: false,
-                theme: AppTheme.lightTheme(context),
+                  theme: AppTheme.lightTheme(context, palette: corePalette),
-                darkTheme: AppTheme.darkTheme(context),
+                  darkTheme: AppTheme.darkTheme(context, palette: corePalette),
                   themeMode: themeMode.themeMode,
-                localizationsDelegates: [
+                  localizationsDelegates: const [
                     GlobalMaterialLocalizations.delegate,
                     GlobalWidgetsLocalizations.delegate,
                     GlobalCupertinoLocalizations.delegate,
                   ],
-                supportedLocales: [
+                  supportedLocales: const [
-                  const Locale('en', 'EN'),
+                    Locale('en', 'EN'),
-                  const Locale('hu', 'HU'),
+                    Locale('hu', 'HU'),
-                  const Locale('de', 'DE'),
+                    Locale('de', 'DE'),
                   ],
                   localeListResolutionCallback: (locales, supported) {
-                  Locale locale = Locale('hu', 'HU');
+                    Locale locale = const Locale('hu', 'HU');
 
                     for (var loc in locales ?? []) {
                       if (supported.contains(loc)) {
@@ -115,7 +130,10 @@ class App extends StatelessWidget {
                     return locale;
                   },
                   onGenerateRoute: (settings) => rootNavigator(settings),
-                initialRoute: user.getUsers().length > 0 ? "navigation" : "login");
+                  initialRoute: user.getUsers().isNotEmpty ? "navigation" : "login",
+                );
+              },
+            );
           },
         ),
       ),
@@ -126,16 +144,17 @@ class App extends StatelessWidget {
     // if platform == android || platform == ios
     switch (route.name) {
       case "login_back":
-        return CupertinoPageRoute(builder: (context) => LoginScreen(back: true));
+        return CupertinoPageRoute(builder: (context) => const LoginScreen(back: true));
       case "login":
-        return _rootRoute(LoginScreen());
+        return _rootRoute(const LoginScreen());
       case "navigation":
-        return _rootRoute(Navigation());
+        return _rootRoute(const NavigationScreen());
       case "login_to_navigation":
-        return loginRoute(Navigation());
+        return loginRoute(const NavigationScreen());
       case "settings":
-        return settingsRoute(SettingsScreen());
+        return settingsRoute(const SettingsScreen());
     }
+    return null;
     // else if platform == windows || ...
   }
 

filcnaplo/lib/database/init.dart

@@ -1,71 +1,127 @@
+// ignore_for_file: avoid_print
+
+import 'dart:io';
+
 import 'package:filcnaplo/database/struct.dart';
 import 'package:filcnaplo/models/settings.dart';
 import 'package:sqflite/sqflite.dart';
+// ignore: depend_on_referenced_packages
+import 'package:sqflite_common_ffi/sqflite_ffi.dart';
+
+const settingsDB = DatabaseStruct("settings", {
+  "language": String, "start_page": int, "rounding": int, "theme": int, "accent_color": int, "news": int, "news_state": int, "developer_mode": int,
+  "update_channel": int, "config": String, // general
+  "grade_color1": int, "grade_color2": int, "grade_color3": int, "grade_color4": int, "grade_color5": int, // grade colors
+  "vibration_strength": int, "ab_weeks": int, "swap_ab_weeks": int,
+  "notifications": int, "notifications_bitfield": int, "notification_poll_interval": int, // notifications
+  "x_filc_id": String, "graph_class_avg": int, "presentation_mode": int, "bell_delay": int, "bell_delay_enabled": int,
+});
+const usersDB = DatabaseStruct(
+    "users", {"id": String, "name": String, "username": String, "password": String, "institute_code": String, "student": String, "role": int});
+const userDataDB = DatabaseStruct("user_data", {
+  "id": String, "grades": String, "timetable": String, "exams": String, "homework": String, "messages": String, "notes": String,
+  "events": String, "absences": String, "group_averages": String,
+  // "subject_lesson_count": String, // non kreta data
+});
+
+Future<void> createTable(Database db, DatabaseStruct struct) => db.execute("CREATE TABLE IF NOT EXISTS ${struct.table} ($struct)");
 
 Future<Database> initDB() async {
-  // await deleteDatabase('app.db'); // for debugging
+  Database db;
-  var db = await openDatabase('app.db');
 
-  var settingsDB = await createSettingsTable(db);
+  if (Platform.isLinux || Platform.isWindows) {
+    sqfliteFfiInit();
+    db = await databaseFactoryFfi.openDatabase("app.db");
+  } else {
+    db = await openDatabase("app.db");
+  }
 
-  // Create table Users
+  await createTable(db, settingsDB);
-  await db.execute("CREATE TABLE IF NOT EXISTS users (id TEXT NOT NULL, name TEXT, username TEXT, password TEXT, institute_code TEXT, student TEXT)");
+  await createTable(db, usersDB);
-  await db.execute("CREATE TABLE IF NOT EXISTS user_data ("
+  await createTable(db, userDataDB);
-      "id TEXT NOT NULL, grades TEXT, timetable TEXT, exams TEXT, homework TEXT, messages TEXT, notes TEXT, events TEXT, absences TEXT)");
 
   if ((await db.rawQuery("SELECT COUNT(*) FROM settings"))[0].values.first == 0) {
     // Set default values for table Settings
     await db.insert("settings", SettingsProvider.defaultSettings().toMap());
   }
 
-  await migrateDB(db, settingsDB.struct.keys);
+  // Migrate Databases
+  try {
+    await migrateDB(
+      db,
+      struct: settingsDB,
+      defaultValues: SettingsProvider.defaultSettings().toMap(),
+    );
+    await migrateDB(
+      db,
+      struct: usersDB,
+      defaultValues: {"role": 0},
+    );
+    await migrateDB(db, struct: userDataDB, defaultValues: {
+      "grades": "[]", "timetable": "[]", "exams": "[]", "homework": "[]", "messages": "[]", "notes": "[]", "events": "[]", "absences": "[]",
+      "group_averages": "[]",
+      // "subject_lesson_count": "{}", // non kreta data
+    });
+  } catch (error) {
+    print("ERROR: migrateDB: $error");
+  }
 
   return db;
 }
 
-Future<DatabaseStruct> createSettingsTable(Database db) async {
+Future<void> migrateDB(
-  var settingsDB = DatabaseStruct({
+  Database db, {
-    "language": String, "start_page": int, "rounding": int, "theme": int, "accent_color": int, "news": int, "news_state": int, "developer_mode": int,
+  required DatabaseStruct struct,
-    "update_channel": int, "config": String, // general
+  required Map<String, Object?> defaultValues,
-    "grade_color1": int, "grade_color2": int, "grade_color3": int, "grade_color4": int, "grade_color5": int, // grade colors
+}) async {
-    "vibration_strength": int, "ab_weeks": int, "swap_ab_weeks": int,
+  var originalRows = await db.query(struct.table);
-    "notifications": int, "notifications_bitfield": int, "notification_poll_interval": int, // notifications
-  });
 
-  // Create table Settings
+  if (originalRows.isEmpty) {
-  await db.execute("CREATE TABLE IF NOT EXISTS settings ($settingsDB)");
+    await db.execute("drop table ${struct.table}");
+    await createTable(db, struct);
+    return;
+  }
 
-  return settingsDB;
+  List<Map<String, dynamic>> migrated = [];
-}
 
-Future<void> migrateDB(Database db, Iterable<String> keys) async {
+  // go through each row and add missing keys or delete non existing keys
-  var settings = (await db.query("settings"))[0];
+  await Future.forEach<Map<String, Object?>>(originalRows, (original) async {
-
+    bool migrationRequired = struct.struct.keys.any((key) => !original.containsKey(key) || original[key] == null) ||
-  bool migrationRequired = keys.any((key) => !settings.containsKey(key) || settings[key] == null);
+        original.keys.any((key) => !struct.struct.containsKey(key));
 
     if (migrationRequired) {
-    var defaultSettings = SettingsProvider.defaultSettings();
+      print("INFO: Migrating ${struct.table}");
-    var settingsCopy = Map<String, dynamic>.from(settings);
+      var copy = Map<String, Object?>.from(original);
-
-    // Delete settings
-    await db.execute("drop table settings");
 
       // Fill missing columns
-    keys.forEach((key) {
+      for (var key in struct.struct.keys) {
-      if (!keys.contains(key)) {
+        if (!original.containsKey(key) || original[key] == null) {
-        print("debug: dropping $key");
+          print("DEBUG: migrating $key");
-        settingsCopy.remove(key);
+          copy[key] = defaultValues[key];
+        }
       }
 
-      if (!settings.containsKey(key) || settings[key] == null) {
+      for (var key in original.keys) {
-        print("DEBUG: migrating $key");
+        if (!struct.struct.keys.contains(key)) {
-        settingsCopy[key] = defaultSettings.toMap()[key];
+          print("DEBUG: dropping $key");
+          copy.remove(key);
+        }
+      }
+
+      migrated.add(copy);
     }
   });
 
-    // Recreate settings
+  // replace the old table with the migrated one
-    await createSettingsTable(db);
+  if (migrated.isNotEmpty) {
-    await db.insert("settings", settingsCopy);
+    // Delete table
+    await db.execute("drop table ${struct.table}");
+
+    // Recreate table
+    await createTable(db, struct);
+    await Future.forEach(migrated, (Map<String, Object?> copy) async {
+      await db.insert(struct.table, copy);
+    });
 
     print("INFO: Database migrated");
   }

filcnaplo/lib/database/query.dart

@@ -1,6 +1,8 @@
 import 'dart:convert';
+import 'package:filcnaplo/models/subject_lesson_count.dart';
 import 'package:filcnaplo/models/user.dart';
-import 'package:sqflite/sqflite.dart';
+// ignore: depend_on_referenced_packages
+import 'package:sqflite_common/sqlite_api.dart';
 
 // Models
 import 'package:filcnaplo/models/settings.dart';
@@ -13,6 +15,7 @@ import 'package:filcnaplo_kreta_api/models/message.dart';
 import 'package:filcnaplo_kreta_api/models/note.dart';
 import 'package:filcnaplo_kreta_api/models/event.dart';
 import 'package:filcnaplo_kreta_api/models/absence.dart';
+import 'package:filcnaplo_kreta_api/models/group_average.dart';
 
 class DatabaseQuery {
   DatabaseQuery({required this.db});
@@ -28,9 +31,9 @@ class DatabaseQuery {
   Future<UserProvider> getUsers() async {
     var userProvider = UserProvider();
     List<Map> usersMap = await db.query("users");
-    usersMap.forEach((user) {
+    for (var user in usersMap) {
       userProvider.addUser(User.fromMap(user));
-    });
+    }
     return userProvider;
   }
 }
@@ -42,7 +45,7 @@ class UserDatabaseQuery {
 
   Future<List<Grade>> getGrades({required String userId}) async {
     List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
-    if (userData.length == 0) return [];
+    if (userData.isEmpty) return [];
     String? gradesJson = userData.elementAt(0)["grades"] as String?;
     if (gradesJson == null) return [];
     List<Grade> grades = (jsonDecode(gradesJson) as List).map((e) => Grade.fromJson(e)).toList();
@@ -51,7 +54,7 @@ class UserDatabaseQuery {
 
   Future<List<Lesson>> getLessons({required String userId}) async {
     List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
-    if (userData.length == 0) return [];
+    if (userData.isEmpty) return [];
     String? lessonsJson = userData.elementAt(0)["timetable"] as String?;
     if (lessonsJson == null) return [];
     List<Lesson> lessons = (jsonDecode(lessonsJson) as List).map((e) => Lesson.fromJson(e)).toList();
@@ -60,7 +63,7 @@ class UserDatabaseQuery {
 
   Future<List<Exam>> getExams({required String userId}) async {
     List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
-    if (userData.length == 0) return [];
+    if (userData.isEmpty) return [];
     String? examsJson = userData.elementAt(0)["exams"] as String?;
     if (examsJson == null) return [];
     List<Exam> exams = (jsonDecode(examsJson) as List).map((e) => Exam.fromJson(e)).toList();
@@ -69,7 +72,7 @@ class UserDatabaseQuery {
 
   Future<List<Homework>> getHomework({required String userId}) async {
     List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
-    if (userData.length == 0) return [];
+    if (userData.isEmpty) return [];
     String? homeworkJson = userData.elementAt(0)["homework"] as String?;
     if (homeworkJson == null) return [];
     List<Homework> homework = (jsonDecode(homeworkJson) as List).map((e) => Homework.fromJson(e)).toList();
@@ -78,7 +81,7 @@ class UserDatabaseQuery {
 
   Future<List<Message>> getMessages({required String userId}) async {
     List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
-    if (userData.length == 0) return [];
+    if (userData.isEmpty) return [];
     String? messagesJson = userData.elementAt(0)["messages"] as String?;
     if (messagesJson == null) return [];
     List<Message> messages = (jsonDecode(messagesJson) as List).map((e) => Message.fromJson(e)).toList();
@@ -87,7 +90,7 @@ class UserDatabaseQuery {
 
   Future<List<Note>> getNotes({required String userId}) async {
     List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
-    if (userData.length == 0) return [];
+    if (userData.isEmpty) return [];
     String? notesJson = userData.elementAt(0)["notes"] as String?;
     if (notesJson == null) return [];
     List<Note> notes = (jsonDecode(notesJson) as List).map((e) => Note.fromJson(e)).toList();
@@ -96,7 +99,7 @@ class UserDatabaseQuery {
 
   Future<List<Event>> getEvents({required String userId}) async {
     List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
-    if (userData.length == 0) return [];
+    if (userData.isEmpty) return [];
     String? eventsJson = userData.elementAt(0)["events"] as String?;
     if (eventsJson == null) return [];
     List<Event> events = (jsonDecode(eventsJson) as List).map((e) => Event.fromJson(e)).toList();
@@ -105,10 +108,28 @@ class UserDatabaseQuery {
 
   Future<List<Absence>> getAbsences({required String userId}) async {
     List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
-    if (userData.length == 0) return [];
+    if (userData.isEmpty) return [];
-    String? absebcesJson = userData.elementAt(0)["absences"] as String?;
+    String? absencesJson = userData.elementAt(0)["absences"] as String?;
-    if (absebcesJson == null) return [];
+    if (absencesJson == null) return [];
-    List<Absence> absebces = (jsonDecode(absebcesJson) as List).map((e) => Absence.fromJson(e)).toList();
+    List<Absence> absences = (jsonDecode(absencesJson) as List).map((e) => Absence.fromJson(e)).toList();
-    return absebces;
+    return absences;
+  }
+
+  Future<List<GroupAverage>> getGroupAverages({required String userId}) async {
+    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    if (userData.isEmpty) return [];
+    String? groupAveragesJson = userData.elementAt(0)["group_averages"] as String?;
+    if (groupAveragesJson == null) return [];
+    List<GroupAverage> groupAverages = (jsonDecode(groupAveragesJson) as List).map((e) => GroupAverage.fromJson(e)).toList();
+    return groupAverages;
+  }
+
+  Future<SubjectLessonCount> getSubjectLessonCount({required String userId}) async {
+    List<Map> userData = await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    if (userData.isEmpty) return SubjectLessonCount.fromMap({});
+    String? lessonCountJson = userData.elementAt(0)["subject_lesson_count"] as String?;
+    if (lessonCountJson == null) return SubjectLessonCount.fromMap({});
+    SubjectLessonCount lessonCount = SubjectLessonCount.fromMap(jsonDecode(lessonCountJson) as Map);
+    return lessonCount;
   }
 }

filcnaplo/lib/database/store.dart

@@ -1,5 +1,7 @@
 import 'dart:convert';
-import 'package:sqflite/sqflite.dart';
+import 'package:filcnaplo/models/subject_lesson_count.dart';
+// ignore: depend_on_referenced_packages
+import 'package:sqflite_common/sqlite_api.dart';
 
 // Models
 import 'package:filcnaplo/models/settings.dart';
@@ -12,6 +14,7 @@ import 'package:filcnaplo_kreta_api/models/message.dart';
 import 'package:filcnaplo_kreta_api/models/note.dart';
 import 'package:filcnaplo_kreta_api/models/event.dart';
 import 'package:filcnaplo_kreta_api/models/absence.dart';
+import 'package:filcnaplo_kreta_api/models/group_average.dart';
 
 class DatabaseStore {
   DatabaseStore({required this.db});
@@ -24,7 +27,7 @@ class DatabaseStore {
 
   Future<void> storeUser(User user) async {
     List userRes = await db.query("users", where: "id = ?", whereArgs: [user.id]);
-    if (userRes.length > 0) {
+    if (userRes.isNotEmpty) {
       await db.update("users", user.toMap(), where: "id = ?", whereArgs: [user.id]);
     } else {
       await db.insert("users", user.toMap());
@@ -43,43 +46,54 @@ class UserDatabaseStore {
 
   final Database db;
 
-  Future storeGrades(List<Grade> grades, {required String userId}) async {
+  Future<void> storeGrades(List<Grade> grades, {required String userId}) async {
     String gradesJson = jsonEncode(grades.map((e) => e.json).toList());
     await db.update("user_data", {"grades": gradesJson}, where: "id = ?", whereArgs: [userId]);
   }
 
-  Future storeLessons(List<Lesson> lessons, {required String userId}) async {
+  Future<void> storeLessons(List<Lesson> lessons, {required String userId}) async {
     String lessonsJson = jsonEncode(lessons.map((e) => e.json).toList());
     await db.update("user_data", {"timetable": lessonsJson}, where: "id = ?", whereArgs: [userId]);
   }
 
-  Future storeExams(List<Exam> exams, {required String userId}) async {
+  Future<void> storeExams(List<Exam> exams, {required String userId}) async {
     String examsJson = jsonEncode(exams.map((e) => e.json).toList());
     await db.update("user_data", {"exams": examsJson}, where: "id = ?", whereArgs: [userId]);
   }
 
-  Future storeHomework(List<Homework> homework, {required String userId}) async {
+  Future<void> storeHomework(List<Homework> homework, {required String userId}) async {
     String homeworkJson = jsonEncode(homework.map((e) => e.json).toList());
     await db.update("user_data", {"homework": homeworkJson}, where: "id = ?", whereArgs: [userId]);
   }
 
-  Future storeMessages(List<Message> messages, {required String userId}) async {
+  Future<void> storeMessages(List<Message> messages, {required String userId}) async {
     String messagesJson = jsonEncode(messages.map((e) => e.json).toList());
     await db.update("user_data", {"messages": messagesJson}, where: "id = ?", whereArgs: [userId]);
   }
 
-  Future storeNotes(List<Note> notes, {required String userId}) async {
+  Future<void> storeNotes(List<Note> notes, {required String userId}) async {
     String notesJson = jsonEncode(notes.map((e) => e.json).toList());
     await db.update("user_data", {"notes": notesJson}, where: "id = ?", whereArgs: [userId]);
   }
 
-  Future storeEvents(List<Event> events, {required String userId}) async {
+  Future<void> storeEvents(List<Event> events, {required String userId}) async {
     String eventsJson = jsonEncode(events.map((e) => e.json).toList());
     await db.update("user_data", {"events": eventsJson}, where: "id = ?", whereArgs: [userId]);
   }
 
-  Future storeAbsences(List<Absence> absences, {required String userId}) async {
+  Future<void> storeAbsences(List<Absence> absences, {required String userId}) async {
     String absencesJson = jsonEncode(absences.map((e) => e.json).toList());
     await db.update("user_data", {"absences": absencesJson}, where: "id = ?", whereArgs: [userId]);
   }
+
+  Future<void> storeGroupAverages(List<GroupAverage> groupAverages, {required String userId}) async {
+    String groupAveragesJson = jsonEncode(groupAverages.map((e) => e.json).toList());
+    await db.update("user_data", {"group_averages": groupAveragesJson}, where: "id = ?", whereArgs: [userId]);
+  }
+
+
+  Future<void> storeSubjectLessonCount(SubjectLessonCount lessonCount, {required String userId}) async {
+    String lessonCountJson = jsonEncode(lessonCount.toMap());
+    await db.update("user_data", {"subject_lesson_count": lessonCountJson}, where: "id = ?", whereArgs: [userId]);
+  }
 }

filcnaplo/lib/database/struct.dart

@@ -1,7 +1,8 @@
 class DatabaseStruct {
+  final String table;
   final Map<String, dynamic> struct;
 
-  DatabaseStruct(this.struct);
+  const DatabaseStruct(this.table, this.struct);
 
   String _toDBfield(String name, dynamic type) {
     String typeName = "";
@@ -15,7 +16,7 @@ class DatabaseStruct {
         break;
     }
 
-    return "${name} ${typeName.toUpperCase()}";
+    return "$name ${typeName.toUpperCase()} ${name == 'id' ? 'NOT NULL' : ''}";
   }
 
   @override

filcnaplo/lib/helpers/attachment_helper.dart

@@ -1,9 +1,13 @@
+// ignore_for_file: use_build_context_synchronously
+
 import 'dart:io';
 import 'dart:typed_data';
 
+import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/helpers/storage_helper.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
 import 'package:filcnaplo_kreta_api/models/attachment.dart';
+import 'package:filcnaplo_kreta_api/models/homework.dart';
 import 'package:flutter/widgets.dart';
 import 'package:open_file/open_file.dart';
 import 'package:provider/provider.dart';
@@ -28,3 +32,25 @@ extension AttachmentHelper on Attachment {
     return result.type == ResultType.done;
   }
 }
+
+extension HomeworkAttachmentHelper on HomeworkAttachment {
+  Future<String> download(BuildContext context, {bool overwrite = false}) async {
+    String downloads = await StorageHelper.downloadsPath();
+
+    if (!overwrite && await File("$downloads/$name").exists()) return "$downloads/$name";
+
+    String url = downloadUrl(Provider.of<UserProvider>(context, listen: false).instituteCode ?? "");
+    Uint8List data = await Provider.of<KretaClient>(context, listen: false).getAPI(url, rawResponse: true);
+    if (!await StorageHelper.write("$downloads/$name", data)) return "";
+
+    return "$downloads/$name";
+  }
+
+  Future<bool> open(BuildContext context) async {
+    String downloads = await StorageHelper.downloadsPath();
+
+    if (!await File("$downloads/$name").exists()) await download(context);
+    var result = await OpenFile.open("$downloads/$name");
+    return result.type == ResultType.done;
+  }
+}

filcnaplo/lib/helpers/average_helper.dart

@@ -6,14 +6,15 @@ class AverageHelper {
 
     List<String> ignoreInFinal = ["5,SzorgalomErtek", "4,MagatartasErtek"];
 
-    if (finalAvg)
+    if (finalAvg) {
       grades.removeWhere((e) =>
           (e.value.value == 0) ||
           (ignoreInFinal.contains(e.gradeType?.id)));
+    }
 
-    grades.forEach((e) {
+    for (var e in grades) {
       average += e.value.value * ((finalAvg ? 100 : e.value.weight) / 100);
-    });
+    }
 
     average = average /
         grades

filcnaplo/lib/helpers/quick_actions.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/cupertino.dart';
+import 'package:quick_actions/quick_actions.dart';
+import 'package:filcnaplo_mobile_ui/common/screens.i18n.dart';
+
+const QuickActions quickActions = QuickActions();
+
+void setupQuickActions() {
+  quickActions.setShortcutItems(<ShortcutItem>[
+    ShortcutItem(type: 'action_grades', localizedTitle: 'grades'.i18n, icon: 'ic_grades'),
+    ShortcutItem(type: 'action_timetable', localizedTitle: 'timetable'.i18n, icon: 'ic_timetable'),
+    ShortcutItem(type: 'action_messages', localizedTitle: 'messages'.i18n, icon: 'ic_messages'),
+    ShortcutItem(type: 'action_absences', localizedTitle: 'absences'.i18n, icon: 'ic_absences')
+  ]);
+}
+
+void handleQuickActions(BuildContext context, void Function(String) callback) {
+  quickActions.initialize((shortcutType) {
+    switch (shortcutType) {
+      case 'action_home':
+        callback("home");
+        break;
+      case 'action_grades':
+        callback("grades");
+        break;
+      case 'action_timetable':
+        callback("timetable");
+        break;
+      case 'action_messages':
+        callback("messages");
+        break;
+      case 'action_absences':
+        callback("absences");
+        break;
+    }
+  });
+}

filcnaplo/lib/helpers/storage_helper.dart

@@ -1,3 +1,5 @@
+// ignore_for_file: avoid_print
+
 import 'dart:io';
 import 'dart:typed_data';
 

filcnaplo/lib/helpers/subject_icon.dart

@@ -7,7 +7,7 @@ class SubjectIcon {
   static IconData? lookup({Subject? subject, String? subjectName}) {
     assert(!(subject == null && subjectName == null));
 
-    String name = subject?.name.toLowerCase().specialChars() ?? subjectName ?? "";
+    String name = (subject?.name ?? subjectName ?? "").toLowerCase().specialChars().trim();
     String category = subject?.category.description.toLowerCase().specialChars() ?? "";
 
     // todo: check for categories
@@ -16,7 +16,7 @@ class SubjectIcon {
     if (RegExp("irodalom").hasMatch(name)) return Icons.menu_book_outlined;
     if (RegExp("tor(i|tenelem)").hasMatch(name)) return Icons.hourglass_empty_outlined;
     if (RegExp("foldrajz").hasMatch(name)) return Icons.public_outlined;
-    if (RegExp("rajz|muvtori|muveszet|kultura").hasMatch(name)) return Icons.palette_outlined;
+    if (RegExp("rajz|muvtori|muveszet|vizualis").hasMatch(name)) return Icons.palette_outlined;
     if (RegExp("fizika").hasMatch(name)) return Icons.emoji_objects_outlined;
     if (RegExp("^enek|zene|szolfezs|zongora|korus").hasMatch(name)) return Icons.music_note_outlined;
     if (RegExp("^tes(i|tneveles)|sport").hasMatch(name)) return Icons.sports_soccer_outlined;
@@ -25,7 +25,7 @@ class SubjectIcon {
     if (RegExp("kornyezet|termeszet(tudomany|ismeret)|hon( es nep)?ismeret").hasMatch(name)) return Icons.eco_outlined;
     if (RegExp("(hit|erkolcs)tan|vallas|etika").hasMatch(name)) return Icons.favorite_border_outlined;
     if (RegExp("penzugy").hasMatch(name)) return Icons.savings_outlined;
-    if (RegExp("informatika|szoftver|iroda").hasMatch(name)) return Icons.computer_outlined;
+    if (RegExp("informatika|szoftver|iroda|digitalis").hasMatch(name)) return Icons.computer_outlined;
     if (RegExp("prog").hasMatch(name)) return Icons.code_outlined;
     if (RegExp("halozat").hasMatch(name)) return Icons.wifi_tethering_outlined;
     if (RegExp("szinhaz").hasMatch(name)) return Icons.theater_comedy_outlined;
@@ -35,7 +35,7 @@ class SubjectIcon {
     if (RegExp("technika").hasMatch(name)) return Icons.build_outlined;
     if (RegExp("tanc").hasMatch(name)) return Icons.speaker_outlined;
     if (RegExp("filozofia").hasMatch(name)) return Icons.psychology_outlined;
-    if (RegExp("osztaly(fonoki|kozosseg)").hasMatch(name)) return Icons.groups_outlined;
+    if (RegExp("osztaly(fonoki|kozosseg)").hasMatch(name) || name == "ofo") return Icons.groups_outlined;
     if (RegExp("gazdasag").hasMatch(name)) return Icons.account_balance_outlined;
     if (RegExp("szorgalom").hasMatch(name)) return Icons.verified_outlined;
     if (RegExp("magatartas").hasMatch(name)) return Icons.emoji_people_outlined;

filcnaplo/lib/helpers/update_helper.dart

@@ -7,31 +7,36 @@ import 'package:filcnaplo/helpers/storage_helper.dart';
 import 'package:filcnaplo/models/release.dart';
 import 'package:open_file/open_file.dart';
 
-enum UpdateState { prepare, downloading, installing }
+enum UpdateState { none, preparing, downloading, installing }
 typedef UpdateCallback = Function(double progress, UpdateState state);
 
+// TODO: cleanup old apk files
+
 extension UpdateHelper on Release {
   Future<void> install({UpdateCallback? updateCallback}) async {
+    updateCallback!(-1, UpdateState.preparing);
+
     String downloads = await StorageHelper.downloadsPath();
-    File apk = File("$downloads/filcnaplo-${version}.apk");
+    File apk = File("$downloads/filcnaplo-$version.apk");
 
     if (!await apk.exists()) {
-      updateCallback!(-1, UpdateState.downloading);
+      updateCallback(-1, UpdateState.downloading);
 
       var bytes = await download(updateCallback: updateCallback);
       if (!await StorageHelper.write(apk.path, bytes)) throw "failed to write apk: permission denied";
     }
 
-    updateCallback!(-1, UpdateState.installing);
+    updateCallback(-1, UpdateState.installing);
 
     var result = await OpenFile.open(apk.path);
 
     if (result.type != ResultType.done) {
-      print("ERROR: installUpdate.openFile: " + result.message);
+      // ignore: avoid_print
+      print("ERROR: installUpdate.openFile: ${result.message}");
       throw result.message;
     }
 
-    updateCallback(-1, UpdateState.prepare);
+    updateCallback(-1, UpdateState.none);
   }
 
   Future<Uint8List> download({UpdateCallback? updateCallback}) async {

filcnaplo/lib/icons/filc_icons.dart

@@ -1,10 +1,19 @@
 import 'package:flutter/widgets.dart';
 
 class FilcIcons {
-  static const IconData home = const FilcIconData(0x41);
+  FilcIcons._();
-  static const IconData linux = const FilcIconData(0x42);
-}
 
-class FilcIconData extends IconData {
+  static const iconFontFamily = 'FilcIcons';
-  const FilcIconData(int codePoint) : super(codePoint, fontFamily: "FilcIcons");
+
+  /// home
+  static const IconData home = IconData(0x00, fontFamily: iconFontFamily);
+
+  /// linux
+  static const IconData linux = IconData(0x01, fontFamily: iconFontFamily);
+
+  /// upstairs
+  static const IconData upstairs = IconData(0x02, fontFamily: iconFontFamily);
+
+  /// downstairs
+  static const IconData downstairs = IconData(0x03, fontFamily: iconFontFamily);
 }

filcnaplo/lib/main.dart

@@ -2,10 +2,12 @@ import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/api/providers/database_provider.dart';
 import 'package:filcnaplo/database/init.dart';
 import 'package:filcnaplo/models/settings.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:filcnaplo/app.dart';
 import 'package:flutter/services.dart';
 import 'package:filcnaplo_mobile_ui/screens/error_screen.dart';
+import 'package:filcnaplo_mobile_ui/screens/error_report_screen.dart';
 
 void main() async {
   // Initalize
@@ -39,12 +41,25 @@ class Startup {
   }
 }
 
+bool errorShown = false;
+String lastException = '';
+
 Widget errorBuilder(FlutterErrorDetails details) {
   return Builder(builder: (context) {
     if (Navigator.of(context).canPop()) Navigator.pop(context);
 
-    WidgetsBinding.instance?.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
-      Navigator.of(context, rootNavigator: true).push(MaterialPageRoute(builder: (ctx) => ErrorScreen(details)));
+      if (!errorShown && details.exceptionAsString() != lastException) {
+        errorShown = true;
+        lastException = details.exceptionAsString();
+        Navigator.of(context, rootNavigator: true).push(MaterialPageRoute(builder: (context) {
+          if (kReleaseMode) {
+            return ErrorReportScreen(details);
+          } else {
+            return ErrorScreen(details);
+          }
+        })).then((_) => errorShown = false);
+      }
     });
 
     return Container();

filcnaplo/lib/models/config.dart

@@ -1,15 +1,11 @@
 import 'dart:io';
 
-import 'package:package_info_plus/package_info_plus.dart';
-
 class Config {
   String _userAgent;
-  String? _version;
   Map? json;
+  static const String _version = String.fromEnvironment("APPVER", defaultValue: "2.2.0");
 
-  Config({required String userAgent, this.json}) : _userAgent = userAgent {
+  Config({required String userAgent, this.json}) : _userAgent = userAgent;
-    PackageInfo.fromPlatform().then((value) => _version = value.version);
-  }
 
   factory Config.fromJson(Map json) {
     return Config(
@@ -18,7 +14,7 @@ class Config {
     );
   }
 
-  String get userAgent => _userAgent.replaceAll("\$0", _version ?? "0").replaceAll("\$1", platform).replaceAll("\$2", "0");
+  String get userAgent => _userAgent.replaceAll("\$0", _version).replaceAll("\$1", platform).replaceAll("\$2", "0");
 
   static String get platform {
     if (Platform.isAndroid) {

filcnaplo/lib/models/release.dart

@@ -58,11 +58,12 @@ class Version {
 
       // check for valid prerelease name
       if (p[0] != "") {
-        if (prereleases.contains(p[0].toLowerCase().trim()))
+        if (prereleases.contains(p[0].toLowerCase().trim())) {
           pre = p[0];
-        else
+        } else {
           throw "invalid prerelease name: ${p[0]}";
         }
+      }
 
       // core
       p = string.split(".");
@@ -74,6 +75,7 @@ class Version {
 
       return Version(x, y, z, prerelease: pre, prever: prev);
     } catch (error) {
+      // ignore: avoid_print
       print("WARNING: Failed to parse version ($o): $error");
       return Version.zero;
     }
@@ -125,5 +127,8 @@ class Version {
   }
 
   static const zero = Version(0, 0, 0);
-  static const List<String> prereleases = ["dev", "pre", "alpha", "beta", "rc"];
+  static const List<String> prereleases = ["dev", "pre", "alpha", "beta", "rc", "nightly", "test"];
+
+  @override
+  int get hashCode => toString().hashCode;
 }

filcnaplo/lib/models/settings.dart

@@ -1,19 +1,20 @@
 import 'dart:convert';
+import 'dart:developer';
 
 import 'package:filcnaplo/api/providers/database_provider.dart';
 import 'package:filcnaplo/models/config.dart';
 import 'package:filcnaplo/theme.dart';
 import 'package:flutter/material.dart';
-import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
+import 'package:uuid/uuid.dart';
 
 enum Pages { home, grades, timetable, messages, absences }
+
 enum UpdateChannel { stable, beta, dev }
+
 enum VibrationStrength { off, light, medium, strong }
 
 class SettingsProvider extends ChangeNotifier {
-  PackageInfo? _packageInfo;
-
   // en_en, hu_hu, de_de
   String _language;
   Pages _startPage;
@@ -43,10 +44,16 @@ class SettingsProvider extends ChangeNotifier {
   int _notificationPollInterval;
   bool _developerMode;
   VibrationStrength _vibrate;
-  bool _ABweeks;
+  bool _abWeeks;
   bool _swapABweeks;
   UpdateChannel _updateChannel;
   Config _config;
+  String _xFilcId;
+  bool _graphClassAvg;
+  bool _goodStudent;
+  bool _presentationMode;
+  bool _bellDelayEnabled;
+  int _bellDelay;
 
   SettingsProvider({
     required String language,
@@ -62,10 +69,16 @@ class SettingsProvider extends ChangeNotifier {
     required bool developerMode,
     required int notificationPollInterval,
     required VibrationStrength vibrate,
-    required bool ABweeks,
+    required bool abWeeks,
     required bool swapABweeks,
     required UpdateChannel updateChannel,
     required Config config,
+    required String xFilcId,
+    required bool graphClassAvg,
+    required bool goodStudent,
+    required bool presentationMode,
+    required bool bellDelayEnabled,
+    required int bellDelay,
   })  : _language = language,
         _startPage = startPage,
         _rounding = rounding,
@@ -79,16 +92,26 @@ class SettingsProvider extends ChangeNotifier {
         _developerMode = developerMode,
         _notificationPollInterval = notificationPollInterval,
         _vibrate = vibrate,
-        _ABweeks = ABweeks,
+        _abWeeks = abWeeks,
         _swapABweeks = swapABweeks,
         _updateChannel = updateChannel,
-        _config = config {
+        _config = config,
-    PackageInfo.fromPlatform().then((PackageInfo packageInfo) {
+        _xFilcId = xFilcId,
-      _packageInfo = packageInfo;
+        _graphClassAvg = graphClassAvg,
-    });
+        _goodStudent = goodStudent,
-  }
+        _presentationMode = presentationMode,
+        _bellDelayEnabled = bellDelayEnabled,
+        _bellDelay = bellDelay;
 
   factory SettingsProvider.fromMap(Map map) {
+    Map<String, Object?>? configMap;
+
+    try {
+      configMap = jsonDecode(map["config"] ?? "{}");
+    } catch (e) {
+      log("[ERROR] SettingsProvider.fromMap: $e");
+    }
+
     return SettingsProvider(
       language: map["language"],
       startPage: Pages.values[map["start_page"]],
@@ -102,17 +125,23 @@ class SettingsProvider extends ChangeNotifier {
         Color(map["grade_color4"]),
         Color(map["grade_color5"]),
       ],
-      newsEnabled: map["news"] == 1 ? true : false,
+      newsEnabled: map["news"] == 1,
       newsState: map["news_state"],
-      notificationsEnabled: map["notifications"] == 1 ? true : false,
+      notificationsEnabled: map["notifications"] == 1,
       notificationsBitfield: map["notifications_bitfield"],
       notificationPollInterval: map["notification_poll_interval"],
-      developerMode: map["developer_mode"] == 1 ? true : false,
+      developerMode: map["developer_mode"] == 1,
       vibrate: VibrationStrength.values[map["vibration_strength"]],
-      ABweeks: map["ab_weeks"] == 1 ? true : false,
+      abWeeks: map["ab_weeks"] == 1,
-      swapABweeks: map["swap_ab_weeks"] == 1 ? true : false,
+      swapABweeks: map["swap_ab_weeks"] == 1,
       updateChannel: UpdateChannel.values[map["update_channel"]],
-      config: Config.fromJson(jsonDecode(map["config"] ?? "{}")),
+      config: Config.fromJson(configMap ?? {}),
+      xFilcId: map["x_filc_id"],
+      graphClassAvg: map["graph_class_avg"] == 1,
+      goodStudent: false,
+      presentationMode: map["presentation_mode"] == 1,
+      bellDelayEnabled: map["bell_delay_enabled"] == 1,
+      bellDelay: map["bell_delay"],
     );
   }
 
@@ -135,10 +164,15 @@ class SettingsProvider extends ChangeNotifier {
       "grade_color5": _gradeColors[4].value,
       "update_channel": _updateChannel.index,
       "vibration_strength": _vibrate.index,
-      "ab_weeks": _ABweeks ? 1 : 0,
+      "ab_weeks": _abWeeks ? 1 : 0,
       "swap_ab_weeks": _swapABweeks ? 1 : 0,
       "notification_poll_interval": _notificationPollInterval,
       "config": jsonEncode(config.json),
+      "x_filc_id": _xFilcId,
+      "graph_class_avg": _graphClassAvg ? 1 : 0,
+      "presentation_mode": _presentationMode ? 1 : 0,
+      "bell_delay_enabled": _bellDelayEnabled ? 1 : 0,
+      "bell_delay": _bellDelay,
     };
   }
 
@@ -163,10 +197,16 @@ class SettingsProvider extends ChangeNotifier {
       developerMode: false,
       notificationPollInterval: 1,
       vibrate: VibrationStrength.medium,
-      ABweeks: false,
+      abWeeks: false,
       swapABweeks: false,
       updateChannel: UpdateChannel.stable,
       config: Config.fromJson({}),
+      xFilcId: const Uuid().v4(),
+      graphClassAvg: false,
+      goodStudent: false,
+      presentationMode: false,
+      bellDelayEnabled: false,
+      bellDelay: 0,
     );
   }
 
@@ -184,15 +224,21 @@ class SettingsProvider extends ChangeNotifier {
   bool get developerMode => _developerMode;
   int get notificationPollInterval => _notificationPollInterval;
   VibrationStrength get vibrate => _vibrate;
-  bool get ABweeks => _ABweeks;
+  bool get abWeeks => _abWeeks;
   bool get swapABweeks => _swapABweeks;
   UpdateChannel get updateChannel => _updateChannel;
-  PackageInfo? get packageInfo => _packageInfo;
   Config get config => _config;
+  String get xFilcId => _xFilcId;
+  bool get graphClassAvg => _graphClassAvg;
+  bool get goodStudent => _goodStudent;
+  bool get presentationMode => _presentationMode;
+  bool get bellDelayEnabled => _bellDelayEnabled;
+  int get bellDelay => _bellDelay;
 
   Future<void> update(
     BuildContext context, {
     DatabaseProvider? database,
+    bool store = true,
     String? language,
     Pages? startPage,
     int? rounding,
@@ -206,10 +252,16 @@ class SettingsProvider extends ChangeNotifier {
     bool? developerMode,
     int? notificationPollInterval,
     VibrationStrength? vibrate,
-    bool? ABweeks,
+    bool? abWeeks,
     bool? swapABweeks,
     UpdateChannel? updateChannel,
     Config? config,
+    String? xFilcId,
+    bool? graphClassAvg,
+    bool? goodStudent,
+    bool? presentationMode,
+    bool? bellDelayEnabled,
+    int? bellDelay,
   }) async {
     if (language != null && language != _language) _language = language;
     if (startPage != null && startPage != _startPage) _startPage = startPage;
@@ -222,16 +274,23 @@ class SettingsProvider extends ChangeNotifier {
     if (notificationsEnabled != null && notificationsEnabled != _notificationsEnabled) _notificationsEnabled = notificationsEnabled;
     if (notificationsBitfield != null && notificationsBitfield != _notificationsBitfield) _notificationsBitfield = notificationsBitfield;
     if (developerMode != null && developerMode != _developerMode) _developerMode = developerMode;
-    if (notificationPollInterval != null && notificationPollInterval != _notificationPollInterval)
+    if (notificationPollInterval != null && notificationPollInterval != _notificationPollInterval) {
       _notificationPollInterval = notificationPollInterval;
+    }
     if (vibrate != null && vibrate != _vibrate) _vibrate = vibrate;
-    if (ABweeks != null && ABweeks != _ABweeks) _ABweeks = ABweeks;
+    if (abWeeks != null && abWeeks != _abWeeks) _abWeeks = abWeeks;
     if (swapABweeks != null && swapABweeks != _swapABweeks) _swapABweeks = swapABweeks;
     if (updateChannel != null && updateChannel != _updateChannel) _updateChannel = updateChannel;
     if (config != null && config != _config) _config = config;
+    if (xFilcId != null && xFilcId != _xFilcId) _xFilcId = xFilcId;
+    if (graphClassAvg != null && graphClassAvg != _graphClassAvg) _graphClassAvg = graphClassAvg;
+    if (goodStudent != null) _goodStudent = goodStudent;
+    if (presentationMode != null && presentationMode != _presentationMode) _presentationMode = presentationMode;
+    if (bellDelay != null && bellDelay != _bellDelay) _bellDelay = bellDelay;
+    if (bellDelayEnabled != null && bellDelayEnabled != _bellDelayEnabled) _bellDelayEnabled = bellDelayEnabled;
 
-    if (database == null) database = Provider.of<DatabaseProvider>(context, listen: false);
+    database ??= Provider.of<DatabaseProvider>(context, listen: false);
-    await database.store.storeSettings(this);
+    if (store) await database.store.storeSettings(this);
     notifyListeners();
   }
 }

filcnaplo/lib/models/subject_lesson_count.dart

@@ -0,0 +1,31 @@
+import 'package:filcnaplo_kreta_api/models/category.dart';
+import 'package:filcnaplo_kreta_api/models/subject.dart';
+
+enum SubjectLessonCountUpdateState { ready, updating }
+
+class SubjectLessonCount {
+  DateTime lastUpdated;
+  Map<Subject, int> subjects;
+  SubjectLessonCountUpdateState state;
+
+  SubjectLessonCount({required this.lastUpdated, required this.subjects, this.state = SubjectLessonCountUpdateState.ready});
+
+  factory SubjectLessonCount.fromMap(Map json) {
+    return SubjectLessonCount(
+      lastUpdated: DateTime.fromMillisecondsSinceEpoch(json["last_updated"] ?? 0),
+      subjects: ((json["subjects"] as Map?) ?? {}).map(
+        (key, value) => MapEntry(
+          Subject(id: key, name: "", category: Category.fromJson({})),
+          value,
+        ),
+      ),
+    );
+  }
+
+  Map toMap() {
+    return {
+      "last_updated": lastUpdated.millisecondsSinceEpoch,
+      "subjects": subjects.map((key, value) => MapEntry(key.id, value)),
+    };
+  }
+}

filcnaplo/lib/models/supporter.dart

@@ -7,7 +7,7 @@ class Supporter {
 
   factory Supporter.fromJson(Map json) {
     return Supporter(
-      json["name"] ?? "",
+      (json["name"] ?? "").trim(),
       json["amount"] ?? "",
       json["platform"] ?? "",
     );

filcnaplo/lib/models/user.dart

@@ -3,6 +3,8 @@ import 'package:filcnaplo_kreta_api/client/api.dart';
 import 'package:filcnaplo_kreta_api/models/student.dart';
 import 'package:uuid/uuid.dart';
 
+enum Role { student, parent }
+
 class User {
   late String id;
   String username;
@@ -10,6 +12,7 @@ class User {
   String instituteCode;
   String name;
   Student student;
+  Role role;
 
   User({
     String? id,
@@ -18,11 +21,12 @@ class User {
     required this.password,
     required this.instituteCode,
     required this.student,
+    required this.role,
   }) {
     if (id != null) {
       this.id = id;
     } else {
-      this.id = Uuid().v4();
+      this.id = const Uuid().v4();
     }
   }
 
@@ -32,8 +36,9 @@ class User {
       instituteCode: map["institute_code"],
       username: map["username"],
       password: map["password"],
-      name: map["name"],
+      name: map["name"].trim(),
       student: Student.fromJson(jsonDecode(map["student"])),
+      role: Role.values[map["role"] ?? 0],
     );
   }
 
@@ -45,9 +50,13 @@ class User {
       "institute_code": instituteCode,
       "name": name,
       "student": jsonEncode(student.json),
+      "role": role.index,
     };
   }
 
+  @override
+  String toString() => jsonEncode(toMap());
+
   static Map<String, Object?> loginBody({
     required String username,
     required String password,
@@ -58,7 +67,7 @@ class User {
       "password": password,
       "institute_code": instituteCode,
       "grant_type": "password",
-      "client_id": KretaAPI.CLIENT_ID,
+      "client_id": KretaAPI.clientId,
     };
   }
 }

filcnaplo/lib/theme.dart

@@ -1,5 +1,6 @@
 import 'package:filcnaplo/models/settings.dart';
 import 'package:flutter/material.dart';
+import 'package:material_color_utilities/material_color_utilities.dart';
 import 'package:provider/provider.dart';
 
 class AppTheme {
@@ -8,56 +9,118 @@ class AppTheme {
 
   static const String _fontFamily = "Montserrat";
 
+  static Color? _paletteAccentLight(CorePalette? palette) => palette != null ? Color(palette.primary.get(70)) : null;
+  static Color? _paletteHighlightLight(CorePalette? palette) => palette != null ? Color(palette.neutral.get(100)) : null;
+  static Color? _paletteBackgroundLight(CorePalette? palette) => palette != null ? Color(palette.neutral.get(95)) : null;
+
+  static Color? _paletteAccentDark(CorePalette? palette) => palette != null ? Color(palette.primary.get(80)) : null;
+  static Color? _paletteBackgroundDark(CorePalette? palette) => palette != null ? Color(palette.neutralVariant.get(10)) : null;
+  static Color? _paletteHighlightDark(CorePalette? palette) => palette != null ? Color(palette.neutralVariant.get(20)) : null;
+
   // Light Theme
-  static ThemeData lightTheme(BuildContext context) {
+  static ThemeData lightTheme(BuildContext context, {CorePalette? palette}) {
     var lightColors = LightAppColors();
-    Color accent = accentColorMap[Provider.of<SettingsProvider>(context, listen: false).accentColor] ?? Color(0);
+    AccentColor accentColor = Provider.of<SettingsProvider>(context, listen: false).accentColor;
+    Color accent = accentColorMap[accentColor] ?? const Color(0x00000000);
+
+    if (accentColor == AccentColor.adaptive) {
+      if (palette != null) accent = _paletteAccentLight(palette)!;
+    } else {
+      palette = null;
+    }
+
     return ThemeData(
       brightness: Brightness.light,
+      useMaterial3: false,
       fontFamily: _fontFamily,
-        scaffoldBackgroundColor: lightColors.background,
+      scaffoldBackgroundColor: _paletteBackgroundLight(palette) ?? lightColors.background,
-        backgroundColor: lightColors.highlight,
+      backgroundColor: _paletteHighlightLight(palette) ?? lightColors.highlight,
       primaryColor: lightColors.filc,
-        dividerColor: Color(0),
+      dividerColor: const Color(0x00000000),
       colorScheme: ColorScheme.fromSwatch(
         accentColor: accent,
-          backgroundColor: lightColors.background,
+        backgroundColor: _paletteBackgroundLight(palette) ?? lightColors.background,
         brightness: Brightness.light,
-          cardColor: lightColors.highlight,
+        cardColor: _paletteHighlightLight(palette) ?? lightColors.highlight,
         errorColor: lightColors.red,
         primaryColorDark: lightColors.filc,
         primarySwatch: Colors.teal,
       ),
       shadowColor: lightColors.shadow,
-        appBarTheme: AppBarTheme(backgroundColor: lightColors.background),
+      appBarTheme: AppBarTheme(backgroundColor: _paletteBackgroundLight(palette) ?? lightColors.background),
       indicatorColor: accent,
-        iconTheme: IconThemeData(color: lightColors.text.withOpacity(.75)));
+      iconTheme: IconThemeData(color: lightColors.text.withOpacity(.75)),
+      navigationBarTheme: NavigationBarThemeData(
+        indicatorColor: accent.withOpacity(accentColor == AccentColor.adaptive ? 0.4 : 0.8),
+        iconTheme: MaterialStateProperty.all(IconThemeData(color: lightColors.text)),
+        backgroundColor: _paletteHighlightLight(palette) ?? lightColors.highlight,
+        labelTextStyle: MaterialStateProperty.all(TextStyle(
+          fontSize: 13.0,
+          fontWeight: FontWeight.w500,
+          color: lightColors.text.withOpacity(0.8),
+        )),
+        labelBehavior: NavigationDestinationLabelBehavior.alwaysShow,
+        height: 76.0,
+      ),
+      sliderTheme: SliderThemeData(
+        inactiveTrackColor: accent.withOpacity(.3),
+      ),
+      progressIndicatorTheme: ProgressIndicatorThemeData(color: accent),
+      expansionTileTheme: ExpansionTileThemeData(iconColor: accent),
+    );
   }
 
   // Dark Theme
-  static ThemeData darkTheme(BuildContext context) {
+  static ThemeData darkTheme(BuildContext context, {CorePalette? palette}) {
     var darkColors = DarkAppColors();
-    Color accent = accentColorMap[Provider.of<SettingsProvider>(context, listen: false).accentColor] ?? Color(0);
+    AccentColor accentColor = Provider.of<SettingsProvider>(context, listen: false).accentColor;
+    Color accent = accentColorMap[accentColor] ?? const Color(0x00000000);
+
+    if (accentColor == AccentColor.adaptive) {
+      if (palette != null) accent = _paletteAccentDark(palette)!;
+    } else {
+      palette = null;
+    }
+
     return ThemeData(
       brightness: Brightness.dark,
+      useMaterial3: false,
       fontFamily: _fontFamily,
-        scaffoldBackgroundColor: darkColors.background,
+      scaffoldBackgroundColor: _paletteBackgroundDark(palette) ?? darkColors.background,
-        backgroundColor: darkColors.highlight,
+      backgroundColor: _paletteHighlightDark(palette) ?? darkColors.highlight,
       primaryColor: darkColors.filc,
-        dividerColor: Color(0),
+      dividerColor: const Color(0x00000000),
       colorScheme: ColorScheme.fromSwatch(
         accentColor: accent,
-          backgroundColor: darkColors.background,
+        backgroundColor: _paletteBackgroundDark(palette) ?? darkColors.background,
         brightness: Brightness.dark,
-          cardColor: darkColors.highlight,
+        cardColor: _paletteHighlightDark(palette) ?? darkColors.highlight,
         errorColor: darkColors.red,
         primaryColorDark: darkColors.filc,
         primarySwatch: Colors.teal,
       ),
       shadowColor: darkColors.shadow,
-        appBarTheme: AppBarTheme(backgroundColor: darkColors.background),
+      appBarTheme: AppBarTheme(backgroundColor: _paletteBackgroundDark(palette) ?? darkColors.background),
       indicatorColor: accent,
-        iconTheme: IconThemeData(color: darkColors.text.withOpacity(.75)));
+      iconTheme: IconThemeData(color: darkColors.text.withOpacity(.75)),
+      navigationBarTheme: NavigationBarThemeData(
+        indicatorColor: accent.withOpacity(accentColor == AccentColor.adaptive ? 0.4 : 0.8),
+        iconTheme: MaterialStateProperty.all(IconThemeData(color: darkColors.text)),
+        backgroundColor: _paletteHighlightDark(palette) ?? darkColors.highlight,
+        labelTextStyle: MaterialStateProperty.all(TextStyle(
+          fontSize: 13.0,
+          fontWeight: FontWeight.w500,
+          color: darkColors.text.withOpacity(0.8),
+        )),
+        labelBehavior: NavigationDestinationLabelBehavior.alwaysShow,
+        height: 76.0,
+      ),
+      sliderTheme: SliderThemeData(
+        inactiveTrackColor: accent.withOpacity(.3),
+      ),
+      progressIndicatorTheme: ProgressIndicatorThemeData(color: accent),
+      expansionTileTheme: ExpansionTileThemeData(iconColor: accent),
+    );
   }
 }
 
@@ -67,69 +130,98 @@ class AppColors {
   }
 }
 
-enum AccentColor { filc, blue, green, lime, yellow, orange, red, pink, purple }
+enum AccentColor { filc, blue, green, lime, yellow, orange, red, pink, purple, adaptive }
 
 Map<AccentColor, Color> accentColorMap = {
-  AccentColor.filc: Color(0xff20AC9B),
+  AccentColor.filc: const Color(0xff20AC9B),
   AccentColor.blue: Colors.blue.shade300,
-  AccentColor.green: Colors.green.shade300,
+  AccentColor.green: Colors.green.shade400,
-  AccentColor.lime: Colors.lime.shade300,
+  AccentColor.lime: Colors.lightGreen.shade400,
-  AccentColor.yellow: Colors.yellow.shade300,
+  AccentColor.yellow: Colors.orange.shade300,
   AccentColor.orange: Colors.deepOrange.shade300,
   AccentColor.red: Colors.red.shade300,
   AccentColor.pink: Colors.pink.shade300,
   AccentColor.purple: Colors.purple.shade300,
+  AccentColor.adaptive: const Color(0xff20AC9B),
 };
 
 abstract class ThemeAppColors {
-  final Color shadow = Color(0);
+  final Color shadow = const Color(0x00000000);
-  final Color text = Color(0);
+  final Color text = const Color(0x00000000);
-  final Color background = Color(0);
+  final Color background = const Color(0x00000000);
-  final Color highlight = Color(0);
+  final Color highlight = const Color(0x00000000);
-  final Color red = Color(0);
+  final Color red = const Color(0x00000000);
-  final Color orange = Color(0);
+  final Color orange = const Color(0x00000000);
-  final Color yellow = Color(0);
+  final Color yellow = const Color(0x00000000);
-  final Color green = Color(0);
+  final Color green = const Color(0x00000000);
-  final Color filc = Color(0);
+  final Color filc = const Color(0x00000000);
-  final Color teal = Color(0);
+  final Color teal = const Color(0x00000000);
-  final Color blue = Color(0);
+  final Color blue = const Color(0x00000000);
-  final Color indigo = Color(0);
+  final Color indigo = const Color(0x00000000);
-  final Color purple = Color(0);
+  final Color purple = const Color(0x00000000);
-  final Color pink = Color(0);
+  final Color pink = const Color(0x00000000);
 }
 
 class LightAppColors implements ThemeAppColors {
-  final shadow = Color(0xffE8E8E8);
+  @override
+  final shadow = const Color(0xffE8E8E8);
+  @override
   final text = Colors.black;
-  final background = Color(0xffF4F9FF);
+  @override
-  final highlight = Color(0xffFFFFFF);
+  final background = const Color(0xffF4F9FF);
-  final red = Color(0xffFF3B30);
+  @override
-  final orange = Color(0xffFF9500);
+  final highlight = const Color(0xffFFFFFF);
-  final yellow = Color(0xffFFCC00);
+  @override
-  final green = Color(0xff34C759);
+  final red = const Color(0xffFF3B30);
-  final filc = Color(0xff247665);
+  @override
-  final teal = Color(0xff5AC8FA);
+  final orange = const Color(0xffFF9500);
-  final blue = Color(0xff007AFF);
+  @override
-  final indigo = Color(0xff5856D6);
+  final yellow = const Color(0xffFFCC00);
-  final purple = Color(0xffAF52DE);
+  @override
-  final pink = Color(0xffFF2D55);
+  final green = const Color(0xff34C759);
+  @override
+  final filc = const Color(0xff247665);
+  @override
+  final teal = const Color(0xff5AC8FA);
+  @override
+  final blue = const Color(0xff007AFF);
+  @override
+  final indigo = const Color(0xff5856D6);
+  @override
+  final purple = const Color(0xffAF52DE);
+  @override
+  final pink = const Color(0xffFF2D55);
 }
 
 class DarkAppColors implements ThemeAppColors {
-  final shadow = Color(0);
+  @override
+  final shadow = const Color(0x00000000);
+  @override
   final text = Colors.white;
-  final background = Color(0xff000000);
+  @override
-  final highlight = Color(0xff141516);
+  final background = const Color(0xff000000);
-  final red = Color(0xffFF453A);
+  @override
-  final orange = Color(0xffFF9F0A);
+  final highlight = const Color(0xff141516);
-  final yellow = Color(0xffFFD60A);
+  @override
-  final green = Color(0xff32D74B);
+  final red = const Color(0xffFF453A);
-  final filc = Color(0xff29826F);
+  @override
-  final teal = Color(0xff64D2FF);
+  final orange = const Color(0xffFF9F0A);
-  final blue = Color(0xff0A84FF);
+  @override
-  final indigo = Color(0xff5E5CE6);
+  final yellow = const Color(0xffFFD60A);
-  final purple = Color(0xffBF5AF2);
+  @override
-  final pink = Color(0xffFF375F);
+  final green = const Color(0xff32D74B);
+  @override
+  final filc = const Color(0xff29826F);
+  @override
+  final teal = const Color(0xff64D2FF);
+  @override
+  final blue = const Color(0xff0A84FF);
+  @override
+  final indigo = const Color(0xff5E5CE6);
+  @override
+  final purple = const Color(0xffBF5AF2);
+  @override
+  final pink = const Color(0xffFF375F);
 }
 
 class ThemeModeObserver extends ChangeNotifier {

filcnaplo/lib/utils/format.dart

@@ -1,3 +1,4 @@
+import 'package:filcnaplo_kreta_api/models/week.dart';
 import 'package:flutter/widgets.dart';
 import 'package:intl/intl.dart';
 import 'package:i18n_extension/i18n_widget.dart';
@@ -5,8 +6,7 @@ import 'package:html/parser.dart';
 import 'format.i18n.dart';
 
 extension StringFormatUtils on String {
-  String specialChars() => this
+  String specialChars() => replaceAll("é", "e")
-      .replaceAll("é", "e")
       .replaceAll("á", "a")
       .replaceAll("ó", "o")
       .replaceAll("ő", "o")
@@ -16,9 +16,9 @@ extension StringFormatUtils on String {
       .replaceAll("ü", "u")
       .replaceAll("í", "i");
 
-  String capital() => this.length > 0 ? this[0].toUpperCase() + this.substring(1) : "";
+  String capital() => isNotEmpty ? this[0].toUpperCase() + substring(1) : "";
 
-  String capitalize() => this.split(" ").map((w) => this.capital()).join(" ");
+  String capitalize() => split(" ").map((w) => w.capital()).join(" ");
 
   String escapeHtml() {
     String htmlString = this;
@@ -32,25 +32,32 @@ extension StringFormatUtils on String {
 }
 
 extension DateFormatUtils on DateTime {
-  String format(BuildContext context, {bool timeOnly = false, bool weekday = false}) {
+  String format(BuildContext context, {bool timeOnly = false, bool forceToday = false, bool weekday = false}) {
     // Time only
     if (timeOnly) return DateFormat("HH:mm").format(this);
 
     DateTime now = DateTime.now();
-    if (now.year == this.year && now.month == this.month && now.day == this.day) {
+    if (now.year == year && now.month == month && now.day == day) {
-      if (this.hour == 0 && this.minute == 0 && this.second == 0) return "Today".i18n;
+      if (hour == 0 && minute == 0 && second == 0 || forceToday) return "Today".i18n;
       return DateFormat("HH:mm").format(this);
     }
-    if (now.year == this.year && now.month == this.month && now.subtract(Duration(days: 1)).day == this.day) return "Yesterday".i18n;
+    if (now.year == year && now.month == month && now.subtract(const Duration(days: 1)).day == day) return "Yesterday".i18n;
+    if (now.year == year && now.month == month && now.add(const Duration(days: 1)).day == day) return "Tomorrow".i18n;
 
     String formatString;
-    if (this.year == now.year)
+
+    // If date is current week, show only weekday
+    if (Week.current().start.isBefore(this) && Week.current().end.isAfter(this)) {
+      formatString = "EEEE";
+    } else {
+      if (year == now.year) {
         formatString = "MMM dd.";
-    else
+      } else {
         formatString = "yy/MM/dd";
+      } // ex. 21/01/01
 
-    if (weekday) formatString += " (EEEE)";
+      if (weekday) formatString += " (EEEE)"; // ex. (monday)
-
+    }
-    return DateFormat(formatString, I18n.of(context).locale.toString()).format(this);
+    return DateFormat(formatString, I18n.of(context).locale.toString()).format(this).capital();
   }
 }

filcnaplo/lib/utils/format.i18n.dart

@@ -6,14 +6,17 @@ extension Localization on String {
         "en_en": {
           "Today": "Today",
           "Yesterday": "Yesterday",
+          "Tomorrow": "Tomorrow",
         },
         "hu_hu": {
           "Today": "Ma",
           "Yesterday": "Tegnap",
+          "Tomorrow": "Holnap",
         },
         "de_de": {
           "Today": "Heute",
           "Yesterday": "Gestern",
+          "Tomorrow": "Morgen",
         }
       };
 

filcnaplo/lib/utils/jwt.dart

@@ -1,7 +1,9 @@
 import 'dart:convert';
 
+import 'package:filcnaplo/models/user.dart';
+
 class JwtUtils {
-  static String? getNameFromJWT(String jwt) {
+  static Map? decodeJwt(String jwt) {
     var parts = jwt.split(".");
     if (parts.length != 3) return null;
 
@@ -11,8 +13,30 @@ class JwtUtils {
       parts[1] += "=";
     }
 
+    try {
       var payload = utf8.decode(base64Url.decode(parts[1]));
-    var jwtData = jsonDecode(payload);
+      return jsonDecode(payload);
-    return jwtData["name"];
+    } catch (error) {
+      // ignore: avoid_print
+      print("ERROR: JwtUtils.decodeJwt: $error");
+    }
+    return null;
+  }
+
+  static String? getNameFromJWT(String jwt) {
+    var jwtData = decodeJwt(jwt);
+    return jwtData?["name"];
+  }
+
+  static Role? getRoleFromJWT(String jwt) {
+    var jwtData = decodeJwt(jwt);
+
+    switch (jwtData?["role"]) {
+      case "Tanulo":
+        return Role.student;
+      case "Gondviselo":
+        return Role.parent;
+    }
+    return null;
   }
 }

filcnaplo/lib/utils/reverse_search.dart

@@ -0,0 +1,37 @@
+import 'dart:developer';
+
+import 'package:filcnaplo_kreta_api/models/absence.dart';
+import 'package:filcnaplo_kreta_api/models/lesson.dart';
+import 'package:filcnaplo_kreta_api/models/week.dart';
+import 'package:filcnaplo_kreta_api/providers/timetable_provider.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:provider/provider.dart';
+
+class ReverseSearch {
+  static Future<Lesson?> getLessonByAbsence(Absence absence, BuildContext context) async {
+    final timetableProvider = Provider.of<TimetableProvider>(context, listen: false);
+
+    List<Lesson> lessons = [];
+    try {
+      await timetableProvider.fetch(week: Week.fromDate(absence.date), db: false);
+    } catch (e) {
+      log("[ERROR] getLessonByAbsence: $e");
+    }
+    lessons = timetableProvider.lessons;
+
+    // Find absence lesson in timetable
+    Lesson lesson = lessons.firstWhere(
+      (l) => _sameDate(l.date, absence.date) && l.subject.id == absence.subject.id && l.lessonIndex == absence.lessonIndex.toString(),
+      orElse: () => Lesson.fromJson({'isEmpty': true}),
+    );
+
+    if (lesson.isEmpty) {
+      return null;
+    } else {
+      return lesson;
+    }
+  }
+
+  // difference.inDays is not reliable
+  static bool _sameDate(DateTime a, DateTime b) => (a.year == b.year && a.month == b.month && a.day == b.day);
+}

filcnaplo/linux/.gitignore

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

filcnaplo/linux/CMakeLists.txt

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

filcnaplo/linux/filcnaplo.desktop

@@ -0,0 +1,8 @@
+  [Desktop Entry]
+  Name=Filc Napló
+  Comment=Nem hivatalos e-napló alkalmazás az eKRÉTA rendszerhez
+  Exec=filcnaplo
+  Icon=icon.png
+  Terminal=false
+  Type=Application
+  Categories=Education;

filcnaplo/linux/flutter/CMakeLists.txt

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

filcnaplo/linux/flutter/generated_plugin_registrant.cc

@@ -0,0 +1,19 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+#include <dynamic_color/dynamic_color_plugin.h>
+#include <url_launcher_linux/url_launcher_plugin.h>
+
+void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
+  dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
+  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
+  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
+}

filcnaplo/linux/flutter/generated_plugin_registrant.h

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

filcnaplo/linux/flutter/generated_plugins.cmake

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

filcnaplo/linux/main.cc

@@ -0,0 +1,6 @@
+#include "my_application.h"
+
+int main(int argc, char** argv) {
+  g_autoptr(MyApplication) app = my_application_new();
+  return g_application_run(G_APPLICATION(app), argc, argv);
+}

filcnaplo/linux/my_application.cc

@@ -0,0 +1,104 @@
+#include "my_application.h"
+
+#include <flutter_linux/flutter_linux.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
+#include "flutter/generated_plugin_registrant.h"
+
+struct _MyApplication {
+  GtkApplication parent_instance;
+  char** dart_entrypoint_arguments;
+};
+
+G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
+
+// Implements GApplication::activate.
+static void my_application_activate(GApplication* application) {
+  MyApplication* self = MY_APPLICATION(application);
+  GtkWindow* window =
+      GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
+
+  // Use a header bar when running in GNOME as this is the common style used
+  // by applications and is the setup most users will be using (e.g. Ubuntu
+  // desktop).
+  // If running on X and not using GNOME then just use a traditional title bar
+  // in case the window manager does more exotic layout, e.g. tiling.
+  // If running on Wayland assume the header bar will work (may need changing
+  // if future cases occur).
+  gboolean use_header_bar = TRUE;
+#ifdef GDK_WINDOWING_X11
+  GdkScreen* screen = gtk_window_get_screen(window);
+  if (GDK_IS_X11_SCREEN(screen)) {
+    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
+    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
+      use_header_bar = FALSE;
+    }
+  }
+#endif
+  if (use_header_bar) {
+    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
+    gtk_widget_show(GTK_WIDGET(header_bar));
+    gtk_header_bar_set_title(header_bar, "Filc Napló");
+    gtk_header_bar_set_show_close_button(header_bar, TRUE);
+    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
+  } else {
+    gtk_window_set_title(window, "Filc Napló");
+  }
+
+  gtk_window_set_default_size(window, 1280, 720);
+  gtk_widget_show(GTK_WIDGET(window));
+
+  g_autoptr(FlDartProject) project = fl_dart_project_new();
+  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
+
+  FlView* view = fl_view_new(project);
+  gtk_widget_show(GTK_WIDGET(view));
+  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
+
+  fl_register_plugins(FL_PLUGIN_REGISTRY(view));
+
+  gtk_widget_grab_focus(GTK_WIDGET(view));
+}
+
+// Implements GApplication::local_command_line.
+static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
+  MyApplication* self = MY_APPLICATION(application);
+  // Strip out the first argument as it is the binary name.
+  self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
+
+  g_autoptr(GError) error = nullptr;
+  if (!g_application_register(application, nullptr, &error)) {
+     g_warning("Failed to register: %s", error->message);
+     *exit_status = 1;
+     return TRUE;
+  }
+
+  g_application_activate(application);
+  *exit_status = 0;
+
+  return TRUE;
+}
+
+// Implements GObject::dispose.
+static void my_application_dispose(GObject* object) {
+  MyApplication* self = MY_APPLICATION(object);
+  g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
+  G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
+}
+
+static void my_application_class_init(MyApplicationClass* klass) {
+  G_APPLICATION_CLASS(klass)->activate = my_application_activate;
+  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
+  G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
+}
+
+static void my_application_init(MyApplication* self) {}
+
+MyApplication* my_application_new() {
+  return MY_APPLICATION(g_object_new(my_application_get_type(),
+                                     "application-id", APPLICATION_ID,
+                                     "flags", G_APPLICATION_NON_UNIQUE,
+                                     nullptr));
+}

filcnaplo/linux/my_application.h

@@ -0,0 +1,18 @@
+#ifndef FLUTTER_MY_APPLICATION_H_
+#define FLUTTER_MY_APPLICATION_H_
+
+#include <gtk/gtk.h>
+
+G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
+                     GtkApplication)
+
+/**
+ * my_application_new:
+ *
+ * Creates a new Flutter-based application.
+ *
+ * Returns: a new #MyApplication.
+ */
+MyApplication* my_application_new();
+
+#endif  // FLUTTER_MY_APPLICATION_H_

filcnaplo/pubspec.yaml

@@ -3,10 +3,10 @@ description: "Nem hivatalos e-napló alkalmazás az e-Kréta rendszerhez"
 homepage: https://filcnaplo.hu
 publish_to: "none"
 
-version: 3.0.0-beta.4+126
+version: 3.3.2+166
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.16.0-80.1.beta <3.0.0"
 
 dependencies:
   flutter:
@@ -30,17 +30,28 @@ dependencies:
   http: ^0.13.3
   uuid: ^3.0.4
   html: ^0.15.0
-  open_file: ^3.2.1
+  open_file:
+    git:
+      url: https://github.com/crazecoder/open_file
+      ref: master
   path_provider: ^2.0.2
-  permission_handler: ^8.1.4+2
+  permission_handler: ^9.2.0
-  share_plus: ^2.1.4
+  share_plus: ^4.0.4
-  package_info_plus: ^1.0.6
+  connectivity_plus: ^2.0.2
+  flutter_displaymode: ^0.4.0
+  quick_actions: ^0.6.0
+  implicitly_animated_reorderable_list: ^0.4.2
+  dynamic_color: ^1.2.2
+  material_color_utilities: ^0.1.3
+  crypto: ^3.0.2
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_lints: ^2.0.1
   # flutter_launcher_icons: ^0.9.0
   # flutter_native_splash: ^1.2.0
+  sqflite_common_ffi: ^2.0.0+3
 
 flutter:
   uses-material-design: true
@@ -101,6 +112,17 @@ flutter:
           weight: 100
           style: italic
 
+    - family: SpaceMono
+      fonts:
+        - asset: assets/fonts/SpaceMono/SpaceMono-Regular.ttf
+        - asset: assets/fonts/SpaceMono/SpaceMono-Bold.ttf
+          weight: 700
+        - asset: assets/fonts/SpaceMono/SpaceMono-Italic.ttf
+          style: italic
+        - asset: assets/fonts/SpaceMono/SpaceMono-BoldItalic.ttf
+          weight: 700
+          style: italic
+
 flutter_icons:
   image_path: "assets/icons/ic_launcher.png"
   adaptive_icon_background: "#1F5B50"

filcnaplo/run.sh

@@ -0,0 +1,12 @@
+#!/bin/fish
+
+function get_version
+  cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1
+end
+
+
+if test -e /mnt/enc/keys/filc3.properties
+  set -x ANDROID_SIGNING /mnt/enc/keys/filc3.properties 
+end
+
+flutter run --debug --dart-define=APPVER=(get_version)

filcnaplo/run_release.sh

@@ -0,0 +1,12 @@
+#!/bin/fish
+
+function get_version
+  cat pubspec.yaml | grep version: | cut -d' ' -f2 | cut -d+ -f1
+end
+
+
+if test -e /mnt/enc/keys/filc3.properties
+  set -x ANDROID_SIGNING /mnt/enc/keys/filc3.properties 
+end
+
+flutter run --release --dart-define=APPVER=(get_version)

fix-d8dx.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd $ANDROID_SDK/build-tools/31.0.0 &&
+  mv -v d8 dx &&
+  cd lib &&
+  mv -v d8.jar dx.jar