new version

.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

@@ -1,8 +1,3 @@
-- Elmaradt és helyettesített órák (főoldal)
+What's new:
-- Feljegyzések (főoldal)
+
-- Faliújság (főoldal)
-- Házi feladatok (főoldal)
-- Dolgozatok (főoldal)
-- Állapot jelző a képernyő alján
-- Hét napjai dátumoknál (Például ha okt. 3. van és kaptál egy jegyet okt. 1-én akkor azt fogja kiírni, hogy Péntek és nem a hónapot, napot)
 - 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/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"
     }
 
@@ -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>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

filcnaplo/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -32,6 +32,8 @@ target 'Runner' do
   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|

filcnaplo/ios/Podfile.lock

@@ -1,12 +1,15 @@
 PODS:
-  - DKImagePickerController/Core (4.3.2):
+  - connectivity_plus (0.0.1):
+    - Flutter
+    - ReachabilitySwift
+  - DKImagePickerController/Core (4.3.4):
     - DKImagePickerController/ImageDataManager
     - DKImagePickerController/Resource
-  - DKImagePickerController/ImageDataManager (4.3.2)
+  - DKImagePickerController/ImageDataManager (4.3.4)
-  - DKImagePickerController/PhotoGallery (4.3.2):
+  - DKImagePickerController/PhotoGallery (4.3.4):
     - DKImagePickerController/Core
     - DKPhotoGallery
-  - DKImagePickerController/Resource (4.3.2)
+  - DKImagePickerController/Resource (4.3.4)
   - DKPhotoGallery (0.0.17):
     - DKPhotoGallery/Core (= 0.0.17)
     - DKPhotoGallery/Model (= 0.0.17)
@@ -41,45 +44,52 @@ PODS:
   - FMDB/standard (2.7.5)
   - open_file (0.0.1):
     - Flutter
-  - package_info_plus (0.4.5):
+  - path_provider_ios (0.0.1):
     - Flutter
-  - path_provider (0.0.1):
+  - permission_handler_apple (9.0.4):
     - Flutter
-  - "permission_handler (5.1.0+2)":
+  - quick_actions_ios (0.0.1):
     - Flutter
-  - SDWebImage (5.11.1):
+  - ReachabilitySwift (5.0.0)
-    - SDWebImage/Core (= 5.11.1)
+  - SDWebImage (5.13.2):
-  - SDWebImage/Core (5.11.1)
+    - 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.0)
+  - SwiftyGif (5.4.3)
-  - url_launcher (0.0.1):
+  - 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`)
-  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
-  - path_provider (from `.symlinks/plugins/path_provider/ios`)
+  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - permission_handler (from `.symlinks/plugins/permission_handler/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 (from `.symlinks/plugins/url_launcher/ios`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
 SPEC REPOS:
   trunk:
-    - DKImagePickerController
     - 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:
@@ -88,36 +98,43 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_custom_tabs/ios"
   open_file:
     :path: ".symlinks/plugins/open_file/ios"
-  package_info_plus:
+  path_provider_ios:
-    :path: ".symlinks/plugins/package_info_plus/ios"
+    :path: ".symlinks/plugins/path_provider_ios/ios"
-  path_provider:
+  permission_handler_apple:
-    :path: ".symlinks/plugins/path_provider/ios"
+    :path: ".symlinks/plugins/permission_handler_apple/ios"
-  permission_handler:
+  quick_actions_ios:
-    :path: ".symlinks/plugins/permission_handler/ios"
+    :path: ".symlinks/plugins/quick_actions_ios/ios"
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   sqflite:
     :path: ".symlinks/plugins/sqflite/ios"
-  url_launcher:
+  url_launcher_ios:
-    :path: ".symlinks/plugins/url_launcher/ios"
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
+
+CHECKOUT OPTIONS:
+  DKImagePickerController:
+    :commit: a727e44718a67e300089174e5591166045815ba4
+    :git: https://github.com/zhangao0086/DKImagePickerController.git
 
 SPEC CHECKSUMS:
-  DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d
+  connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
+  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1
+  file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_custom_tabs: 7a10a08686955cb748e5d26e0ae586d30689bf89
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
-  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
+  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
-  path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
+  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
-  permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
+  quick_actions_ios: 5ec8f5f1ae81512ac803fe10c197ebb875767a9e
-  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
+  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
   sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
-  SwiftyGif: 5d4af95df24caf1c570dbbcb32a3b8a0763bc6d7
+  SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
-  url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
+  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: 862f939bb7e5390bdb8b2534eb81a9457ea9fbdc
 
-COCOAPODS: 1.11.0
+COCOAPODS: 1.11.3

filcnaplo/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -76,7 +76,6 @@
 				98578F0EBCC6D3FF8391AAEB /* Pods-Runner.release.xcconfig */,
 				707F8089D970F81C480F73C4 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -156,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -322,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;
@@ -340,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;
@@ -358,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";
@@ -390,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;
@@ -414,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;
@@ -445,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;
@@ -463,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;
@@ -482,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";
@@ -501,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/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

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

filcnaplo/lib/api/client.dart

@@ -1,4 +1,7 @@
+// ignore_for_file: avoid_print
+
 import 'dart:convert';
+import 'dart:developer';
 
 import 'package:filcnaplo/models/config.dart';
 import 'package:filcnaplo/models/news.dart';
@@ -11,23 +14,23 @@ import 'package:connectivity_plus/connectivity_plus.dart';
 
 class FilcAPI {
   // Public API
-  static const SCHOOL_LIST = "https://filcnaplo.hu/v2/school_list.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";
 
   // Private API
-  static const CONFIG = "https://api.filcnaplo.hu/config";
+  static const config = "https://api.filcnaplo.hu/config";
-  static const REPORT = "https://api.filcnaplo.hu/report";
+  static const reportApi = "https://api.filcnaplo.hu/report";
 
   // Updates
-  static const REPO = "filc/naplo";
+  static const repo = "filc/naplo";
-  static const RELEASES = "https://api.github.com/repos/$REPO/releases";
+  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) {
         List<School> schools = (jsonDecode(res.body) as List).cast<Map>().map((json) => School.fromJson(json)).toList();
@@ -43,32 +46,39 @@ class FilcAPI {
     } catch (error) {
       print("ERROR: FilcAPI.getSchools: $error");
     }
+    return null;
   }
 
   static Future<Config?> getConfig(SettingsProvider settings) async {
+    final userAgent = SettingsProvider.defaultSettings().config.userAgent;
+
     Map<String, String> headers = {
       "x-filc-id": settings.xFilcId,
-      "user-agent": SettingsProvider.defaultSettings().config.userAgent,
+      "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), headers: headers);
+      http.Response res = await http.get(Uri.parse(config), headers: headers);
 
       if (res.statusCode == 200) {
         return Config.fromJson(jsonDecode(res.body));
       } else if (res.statusCode == 429) {
-        res = await http.get(Uri.parse(CONFIG));
+        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();
@@ -78,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));
@@ -92,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();
@@ -106,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));
@@ -124,7 +137,7 @@ class FilcAPI {
 
   static Future<void> sendReport(ErrorReport report) async {
     try {
-      http.Response res = await http.post(Uri.parse(REPORT), body: {
+      http.Response res = await http.post(Uri.parse(reportApi), body: {
         "os": report.os,
         "version": report.version,
         "error": report.error,

filcnaplo/lib/api/login.dart

@@ -1,3 +1,5 @@
+// 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';
@@ -22,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;
 }

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

@@ -3,6 +3,7 @@ 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 {

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

@@ -5,14 +5,14 @@ import 'package:http/http.dart' as http;
 enum Status { network, maintenance, syncing }
 
 class StatusProvider extends ChangeNotifier {
-  List<Status> _stack = [];
+  final List<Status> _stack = [];
   double _progress = 0.0;
 
   StatusProvider() {
     _handleNetworkChanges();
   }
 
-  Status? getStatus() => _stack.length > 0 ? _stack[0] : null;
+  Status? getStatus() => _stack.isNotEmpty ? _stack[0] : null;
   // Status progress from 0.0 to 1.0
   double get progress => _progress;
 
@@ -64,10 +64,12 @@ class StatusProvider extends ChangeNotifier {
     if (_progress == 1.0) {
       notifyListeners();
       // Wait for animation
-      Future.delayed(Duration(milliseconds: 250), () {
+      Future.delayed(const Duration(milliseconds: 250), () {
         _stack.remove(Status.syncing);
         notifyListeners();
       });
-    } else if (progress != prev) notifyListeners();
+    } else if (progress != prev) {
+      notifyListeners();
+    }
   }
 }

filcnaplo/lib/api/providers/sync.dart

@@ -1,3 +1,5 @@
+// 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';
@@ -24,6 +26,7 @@ Future<void> syncAll(BuildContext context) {
   // Lock
   lock = true;
 
+  // ignore: avoid_print
   print("INFO Syncing all");
 
   UserProvider user = Provider.of<UserProvider>(context, listen: false);
@@ -32,24 +35,24 @@ Future<void> syncAll(BuildContext context) {
   List<Future<void>> tasks = [];
   int taski = 0;
 
-  Future<void> _syncStatus(Future<void> future) async {
+  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<GradeProvider>(context, listen: false).fetch()),
-    _syncStatus(Provider.of<TimetableProvider>(context, listen: false).fetch(week: Week.current())),
+    syncStatus(Provider.of<TimetableProvider>(context, listen: false).fetch(week: Week.current())),
-    _syncStatus(Provider.of<ExamProvider>(context, listen: false).fetch()),
+    syncStatus(Provider.of<ExamProvider>(context, listen: false).fetch()),
-    _syncStatus(Provider.of<HomeworkProvider>(context, listen: false).fetch(from: DateTime.now().subtract(Duration(days: 30)))),
+    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<MessageProvider>(context, listen: false).fetchAll()),
-    _syncStatus(Provider.of<NoteProvider>(context, listen: false).fetch()),
+    syncStatus(Provider.of<NoteProvider>(context, listen: false).fetch()),
-    _syncStatus(Provider.of<EventProvider>(context, listen: false).fetch()),
+    syncStatus(Provider.of<EventProvider>(context, listen: false).fetch()),
-    _syncStatus(Provider.of<AbsenceProvider>(context, listen: false).fetch()),
+    syncStatus(Provider.of<AbsenceProvider>(context, listen: false).fetch()),
 
     // Sync student
-    _syncStatus(() async {
+    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;

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];
 
@@ -23,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,6 +1,7 @@
 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';
@@ -18,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
@@ -41,7 +43,7 @@ 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
@@ -51,12 +53,14 @@ class App extends StatelessWidget {
     // Set high refresh mode #28
     if (Platform.isAndroid) FlutterDisplayMode.setHighRefreshRate();
 
-    WidgetsBinding.instance?.addPostFrameCallback((_) {
+    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(
@@ -84,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
@@ -96,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)) {
@@ -122,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",
+                );
+              },
+            );
           },
         ),
       ),
@@ -133,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(NavigationScreen());
+        return _rootRoute(const NavigationScreen());
       case "login_to_navigation":
-        return loginRoute(NavigationScreen());
+        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,10 +1,31 @@
+// 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 {
   Database db;
 
@@ -15,12 +36,9 @@ Future<Database> initDB() async {
     db = await openDatabase("app.db");
   }
 
-  var settingsDB = await createSettingsTable(db);
+  await createTable(db, settingsDB);
-
+  await createTable(db, usersDB);
-  // Create table Users
+  await createTable(db, userDataDB);
-  var usersDB = await createUsersTable(db);
-  await db.execute("CREATE TABLE IF NOT EXISTS user_data ("
-      "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
@@ -28,87 +46,81 @@ Future<Database> initDB() async {
   }
 
   // Migrate Databases
-  await migrateDB(db, "settings", settingsDB.struct.keys, SettingsProvider.defaultSettings().toMap(), createSettingsTable);
+  try {
-  await migrateDB(db, "users", usersDB.struct.keys, {"role": 0}, createUsersTable);
+    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 {
-  var settingsDB = DatabaseStruct({
-    "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,
-  });
-
-  // Create table Settings
-  await db.execute("CREATE TABLE IF NOT EXISTS settings ($settingsDB)");
-
-  return settingsDB;
-}
-
-Future<DatabaseStruct> createUsersTable(Database db) async {
-  var usersDB = DatabaseStruct(
-      {"id": String, "name": String, "username": String, "password": String, "institute_code": String, "student": String, "role": int});
-
-  // Create table Users
-  await db.execute("CREATE TABLE IF NOT EXISTS users ($usersDB)");
-
-  return usersDB;
-}
-
 Future<void> migrateDB(
-  Database db,
+  Database db, {
-  String table,
+  required DatabaseStruct struct,
-  Iterable<String> keys,
+  required Map<String, Object?> defaultValues,
-  Map<String, Object?> defaultValues,
+}) async {
-  Future<DatabaseStruct> Function(Database) create,
+  var originalRows = await db.query(struct.table);
-) async {
-  var originalRows = await db.query(table);
 
-  if (originalRows.length == 0) {
+  if (originalRows.isEmpty) {
-    await db.execute("drop table $table");
+    await db.execute("drop table ${struct.table}");
-    await create(db);
+    await createTable(db, struct);
     return;
   }
 
   List<Map<String, dynamic>> migrated = [];
 
+  // go through each row and add missing keys or delete non existing keys
   await Future.forEach<Map<String, Object?>>(originalRows, (original) async {
-    bool migrationRequired = keys.any((key) => !original.containsKey(key) || original[key] == null);
+    bool migrationRequired = struct.struct.keys.any((key) => !original.containsKey(key) || original[key] == null) ||
+        original.keys.any((key) => !struct.struct.containsKey(key));
 
     if (migrationRequired) {
-      print("INFO: Migrating $table");
+      print("INFO: Migrating ${struct.table}");
-      var copy = Map<String, dynamic>.from(original);
+      var copy = Map<String, Object?>.from(original);
 
       // Fill missing columns
-      keys.forEach((key) {
+      for (var key in struct.struct.keys) {
-        if (!keys.contains(key)) {
-          print("DEBUG: dropping $key");
-          copy.remove(key);
-        }
-
         if (!original.containsKey(key) || original[key] == null) {
           print("DEBUG: migrating $key");
           copy[key] = defaultValues[key];
         }
-      });
+      }
+
+      for (var key in original.keys) {
+        if (!struct.struct.keys.contains(key)) {
+          print("DEBUG: dropping $key");
+          copy.remove(key);
+        }
+      }
 
       migrated.add(copy);
     }
   });
 
-  if (migrated.length > 0) {
+  // replace the old table with the migrated one
+  if (migrated.isNotEmpty) {
     // Delete table
-    await db.execute("drop table $table");
+    await db.execute("drop table ${struct.table}");
 
     // Recreate table
-    await create(db);
+    await createTable(db, struct);
-    await Future.forEach(migrated, (Map<String, dynamic> copy) async {
+    await Future.forEach(migrated, (Map<String, Object?> copy) async {
-      await db.insert(table, copy);
+      await db.insert(struct.table, copy);
     });
 
     print("INFO: Database migrated");

filcnaplo/lib/database/query.dart

@@ -1,5 +1,7 @@
 import 'dart:convert';
+import 'package:filcnaplo/models/subject_lesson_count.dart';
 import 'package:filcnaplo/models/user.dart';
+// ignore: depend_on_referenced_packages
 import 'package:sqflite_common/sqlite_api.dart';
 
 // Models
@@ -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,4 +1,6 @@
 import 'dart:convert';
+import 'package:filcnaplo/models/subject_lesson_count.dart';
+// ignore: depend_on_referenced_packages
 import 'package:sqflite_common/sqlite_api.dart';
 
 // Models
@@ -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()} ${name == 'id' ? 'NOT NULL' : ''}";
+    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().trim() ?? 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").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;
@@ -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,33 +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

@@ -48,15 +48,16 @@ Widget errorBuilder(FlutterErrorDetails details) {
   return Builder(builder: (context) {
     if (Navigator.of(context).canPop()) Navigator.pop(context);
 
-    WidgetsBinding.instance?.addPostFrameCallback((_) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!errorShown && details.exceptionAsString() != lastException) {
         errorShown = true;
         lastException = details.exceptionAsString();
         Navigator.of(context, rootNavigator: true).push(MaterialPageRoute(builder: (context) {
-          if (kReleaseMode)
+          if (kReleaseMode) {
             return ErrorReportScreen(details);
-          else
+          } else {
             return ErrorScreen(details);
+          }
         })).then((_) => errorShown = false);
       }
     });

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,20 +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;
@@ -44,11 +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,
@@ -64,11 +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,
@@ -82,17 +92,26 @@ class SettingsProvider extends ChangeNotifier {
         _developerMode = developerMode,
         _notificationPollInterval = notificationPollInterval,
         _vibrate = vibrate,
-        _ABweeks = ABweeks,
+        _abWeeks = abWeeks,
         _swapABweeks = swapABweeks,
         _updateChannel = updateChannel,
         _config = config,
-        _xFilcId = xFilcId {
+        _xFilcId = xFilcId,
-    PackageInfo.fromPlatform().then((PackageInfo packageInfo) {
+        _graphClassAvg = graphClassAvg,
-      _packageInfo = packageInfo;
+        _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"]],
@@ -106,18 +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"],
     );
   }
 
@@ -140,11 +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,
     };
   }
 
@@ -169,11 +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: Uuid().v4(),
+      xFilcId: const Uuid().v4(),
+      graphClassAvg: false,
+      goodStudent: false,
+      presentationMode: false,
+      bellDelayEnabled: false,
+      bellDelay: 0,
     );
   }
 
@@ -191,16 +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,
@@ -214,11 +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;
@@ -231,17 +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/user.dart

@@ -26,7 +26,7 @@ class User {
     if (id != null) {
       this.id = id;
     } else {
-      this.id = Uuid().v4();
+      this.id = const Uuid().v4();
     }
   }
 
@@ -67,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

@@ -6,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")
@@ -17,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) => w.capital()).join(" ");
+  String capitalize() => split(" ").map((w) => w.capital()).join(" ");
 
   String escapeHtml() {
     String htmlString = this;
@@ -33,28 +32,29 @@ 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 == this.year && now.month == this.month && now.add(Duration(days: 1)).day == this.day) return "Tomorrow".i18n;
+    if (now.year == year && now.month == month && now.add(const Duration(days: 1)).day == day) return "Tomorrow".i18n;
 
     String formatString;
 
     // If date is current week, show only weekday
-    if (Week.current().start.isBefore(this) && Week.current().end.isAfter(this))
+    if (Week.current().start.isBefore(this) && Week.current().end.isAfter(this)) {
-      formatString = "EEEE"; // ex. monday
+      formatString = "EEEE";
-    else {
+    } else {
-      if (this.year == now.year)
+      if (year == now.year) {
-        formatString = "MMM dd."; // ex. Jan. 01.
+        formatString = "MMM dd.";
-      else
+      } else {
-        formatString = "yy/MM/dd"; // ex. 21/01/01
+        formatString = "yy/MM/dd";
+      } // ex. 21/01/01
 
       if (weekday) formatString += " (EEEE)"; // ex. (monday)
     }

filcnaplo/lib/utils/jwt.dart

@@ -17,8 +17,10 @@ class JwtUtils {
       var payload = utf8.decode(base64Url.decode(parts[1]));
       return jsonDecode(payload);
     } catch (error) {
+      // ignore: avoid_print
       print("ERROR: JwtUtils.decodeJwt: $error");
     }
+    return null;
   }
 
   static String? getNameFromJWT(String jwt) {
@@ -35,5 +37,6 @@ class JwtUtils {
       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/flutter/generated_plugin_registrant.cc

@@ -6,9 +6,13 @@
 
 #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_plugins.cmake

@@ -3,9 +3,13 @@
 #
 
 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})
@@ -14,3 +18,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
   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/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.1.0+138
+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,25 @@ 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
-  connectivity_plus: ^1.1.0
+  flutter_displaymode: ^0.4.0
-  flutter_displaymode: ^0.3.2
+  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

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