started uwu mode

This reverts commit ef7437979c.

.gitignore

@@ -25,3 +25,26 @@ doc/api/
 *.js.map
 
 *.txt
+filcnaplo/linux/flutter/generated_plugin_registrant.cc
+filcnaplo/linux/flutter/generated_plugin_registrant.h
+filcnaplo/linux/flutter/generated_plugins.cmake
+filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/connectivity_plus
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/dynamic_color
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/flutter_acrylic
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/path_provider_windows
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/permission_handler_windows
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/share_plus_windows
+filcnaplo/windows/flutter/ephemeral/.plugin_symlinks/url_launcher_windows
+filcnaplo/windows/flutter/ephemeral/generated_config.cmake
+filcnaplo/windows/flutter/generated_plugin_registrant.cc
+filcnaplo/windows/flutter/generated_plugin_registrant.h
+filcnaplo/windows/flutter/generated_plugins.cmake
+filcnaplo/linux/flutter/generated_plugin_registrant.cc
+filcnaplo/linux/flutter/generated_plugin_registrant.h
+filcnaplo/linux/flutter/generated_plugins.cmake
+filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift
+filcnaplo/linux/flutter/generated_plugin_registrant.cc
+filcnaplo/linux/flutter/generated_plugin_registrant.h
+filcnaplo/linux/flutter/generated_plugins.cmake
+filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift

.vscode/launch.json

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

README.md

@@ -1,5 +1,5 @@
 <p align=center>
-  <img src="https://media.discordapp.net/attachments/1111727410677825596/1111790518964326510/reFilc_Logo2.png?width=671&height=671" width=150>
+  <img src="https://media.discordapp.net/attachments/1111727410677825596/1113217167513624646/reFilc_Logo_Squircle.png?width=671&height=671" width=150>
   <h1 align=center><b>reFilc</b></h1>
 </p>
 
@@ -27,12 +27,16 @@ cd filcnaplo
 flutter run
 ```
 
+### Contribution
+
+Az összes (ugyan azon verzióhoz tartozó) contribution meg fog jelenni a release-nél. Kérjük, írd le a Discord nevedet a Description-be, hogy adhassunk rangot.
+
 -------
 
 # Kudo
 
 **annon:** a Filc napló készítője (ez az app a Filcen alapul)
 
-**kima, chromium, peighter, mog, WolfY:** a fejlesztői csapat
+**kima, mog, WolfY:** fő fejlesztők
 
 **Regő, Pearoo:** weboldal design és community management

filcnaplo/android/app/build.gradle

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

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

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

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

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" package="hu.filc.naplo">
+    xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo">
     <application android:label="reFilc" tools:replace="android:label" android:icon="@mipmap/ic_launcher"
         android:requestLegacyExternalStorage="true">
         <activity android:exported="true" android:name=".MainActivity"

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

@@ -1,4 +1,4 @@
-package hu.filc.naplo;
+package hu.refilc.naplo;
 
 import android.os.Bundle;
 

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

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

filcnaplo/ios/Flutter/Generated 2.xcconfig

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

filcnaplo/ios/Podfile.lock

@@ -77,6 +77,8 @@ PODS:
   - Mantle/extobjc (2.2.0)
   - open_file (0.0.1):
     - Flutter
+  - package_info_plus (0.4.5):
+    - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -120,6 +122,7 @@ DEPENDENCIES:
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
   - live_activities (from `.symlinks/plugins/live_activities/ios`)
   - open_file (from `.symlinks/plugins/open_file/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - quick_actions_ios (from `.symlinks/plugins/quick_actions_ios/ios`)
@@ -171,6 +174,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/live_activities/ios"
   open_file:
     :path: ".symlinks/plugins/open_file/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
@@ -213,6 +218,7 @@ SPEC CHECKSUMS:
   live_activities: 9ff56a06a2d43ecd68f56deeed13b18a8304789c
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
   open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
+  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
   permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
   quick_actions_ios: 9e80dcfadfbc5d47d9cf8f47bcf428b11cf383d4

filcnaplo/ios/Runner.xcodeproj/project.pbxproj

@@ -478,7 +478,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = 195;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = reFilc;
@@ -488,7 +488,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 3.6.0;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -510,7 +510,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = livecard/Info.plist;
@@ -526,7 +526,7 @@
 				MARKETING_VERSION = 1.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo.livecardpro;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo.livecardpro;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -552,7 +552,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = livecard/Info.plist;
@@ -567,7 +567,7 @@
 				);
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo.livecardpro;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo.livecardpro;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -592,7 +592,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = livecard/Info.plist;
@@ -607,7 +607,7 @@
 				);
 				MARKETING_VERSION = 1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo.livecardpro;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo.livecardpro;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
@@ -736,7 +736,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = 195;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = reFilc;
@@ -746,7 +746,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 3.6.0;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -764,7 +764,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = 195;
-				DEVELOPMENT_TEAM = JWGEQSC9U7;
+				DEVELOPMENT_TEAM = 48XS7JAZB7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = reFilc;
@@ -774,7 +774,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 3.6.0;
-				PRODUCT_BUNDLE_IDENTIFIER = hu.refilc.naplo;
+				PRODUCT_BUNDLE_IDENTIFIER = com.refilc.naplo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

filcnaplo/ios/Runner/Runner.entitlements

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

filcnaplo/ios/livecard/livecard.entitlements

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

filcnaplo/lib/api/providers/live_card_provider.dart

@@ -13,7 +13,14 @@ import 'package:flutter/foundation.dart';
 import 'package:live_activities/live_activities.dart';
 import 'package:filcnaplo_mobile_ui/pages/home/live_card/live_card.i18n.dart';
 
-enum LiveCardState { empty, duringLesson, duringBreak, morning, afternoon, night }
+enum LiveCardState {
+  empty,
+  duringLesson,
+  duringBreak,
+  morning,
+  afternoon,
+  night
+}
 
 class LiveCardProvider extends ChangeNotifier {
   Lesson? currentLesson;
@@ -42,14 +49,17 @@ class LiveCardProvider extends ChangeNotifier {
       _latestActivityId = value.isNotEmpty ? value.first : null;
     });
     _timer = Timer.periodic(const Duration(seconds: 1), (timer) => update());
-    _delay = settings.bellDelayEnabled ? Duration(seconds: settings.bellDelay) : Duration.zero;
+    _delay = settings.bellDelayEnabled
+        ? Duration(seconds: settings.bellDelay)
+        : Duration.zero;
     update();
   }
 
   @override
   void dispose() {
     _timer.cancel();
-    if (_latestActivityId != null && Platform.isIOS) _liveActivitiesPlugin.endActivity(_latestActivityId!);
+    if (_latestActivityId != null && Platform.isIOS)
+      _liveActivitiesPlugin.endActivity(_latestActivityId!);
     super.dispose();
   }
 
@@ -78,14 +88,25 @@ class LiveCardProvider extends ChangeNotifier {
     switch (currentState) {
       case LiveCardState.duringLesson:
         return {
-          "icon": currentLesson != null ? SubjectIcon.resolveName(subject: currentLesson?.subject) : "book",
-          "index": currentLesson != null ? '${currentLesson!.lessonIndex}. ' : "",
-          "title": currentLesson != null ? ShortSubject.resolve(subject: currentLesson?.subject).capital() : "",
+          "icon": currentLesson != null
+              ? SubjectIcon.resolveName(subject: currentLesson?.subject)
+              : "book",
+          "index":
+              currentLesson != null ? '${currentLesson!.lessonIndex}. ' : "",
+          "title": currentLesson != null
+              ? ShortSubject.resolve(subject: currentLesson?.subject).capital()
+              : "",
           "subtitle": currentLesson?.room.replaceAll("_", " ") ?? "",
           "description": currentLesson?.description ?? "",
-          "startDate": ((currentLesson?.start.millisecondsSinceEpoch ?? 0) - _delay.inMilliseconds).toString(),
-          "endDate": ((currentLesson?.end.millisecondsSinceEpoch ?? 0) - _delay.inMilliseconds).toString(),
-          "nextSubject": nextLesson != null ? ShortSubject.resolve(subject: nextLesson?.subject).capital() : "",
+          "startDate": ((currentLesson?.start.millisecondsSinceEpoch ?? 0) -
+                  _delay.inMilliseconds)
+              .toString(),
+          "endDate": ((currentLesson?.end.millisecondsSinceEpoch ?? 0) -
+                  _delay.inMilliseconds)
+              .toString(),
+          "nextSubject": nextLesson != null
+              ? ShortSubject.resolve(subject: nextLesson?.subject).capital()
+              : "",
           "nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "",
         };
       case LiveCardState.duringBreak:
@@ -101,10 +122,19 @@ class LiveCardProvider extends ChangeNotifier {
         return {
           "icon": iconFloorMap[diff] ?? "cup.and.saucer",
           "title": "Szünet",
-          "description": "go $diff".i18n.fill([diff != "to room" ? (nextLesson!.getFloor() ?? 0) : nextLesson!.room]),
-          "startDate": ((prevLesson?.end.millisecondsSinceEpoch ?? 0) - _delay.inMilliseconds).toString(),
-          "endDate": ((nextLesson?.start.millisecondsSinceEpoch ?? 0) - _delay.inMilliseconds).toString(),
-          "nextSubject": (nextLesson != null ? ShortSubject.resolve(subject: nextLesson?.subject) : "").capital(),
+          "description": "go $diff".i18n.fill([
+            diff != "to room" ? (nextLesson!.getFloor() ?? 0) : nextLesson!.room
+          ]),
+          "startDate": ((prevLesson?.end.millisecondsSinceEpoch ?? 0) -
+                  _delay.inMilliseconds)
+              .toString(),
+          "endDate": ((nextLesson?.start.millisecondsSinceEpoch ?? 0) -
+                  _delay.inMilliseconds)
+              .toString(),
+          "nextSubject": (nextLesson != null
+                  ? ShortSubject.resolve(subject: nextLesson?.subject)
+                  : "")
+              .capital(),
           "nextRoom": nextLesson?.room.replaceAll("_", " ") ?? "",
           "index": "",
           "subtitle": "",
@@ -119,15 +149,25 @@ class LiveCardProvider extends ChangeNotifier {
       final cmap = toMap();
       if (!mapEquals(cmap, _lastActivity)) {
         _lastActivity = cmap;
-
-        if (_lastActivity.isNotEmpty) {
-          if (_latestActivityId == null) {
-            _liveActivitiesPlugin.createActivity(_lastActivity).then((value) => _latestActivityId = value);
+        try {
+          if (_lastActivity.isNotEmpty) {
+            if (_latestActivityId == null) {
+              _liveActivitiesPlugin
+                  .createActivity(_lastActivity)
+                  .then((value) => _latestActivityId = value);
+            } else {
+              _liveActivitiesPlugin.updateActivity(
+                  _latestActivityId!, _lastActivity);
+            }
           } else {
-            _liveActivitiesPlugin.updateActivity(_latestActivityId!, _lastActivity);
+            if (_latestActivityId != null) {
+              _liveActivitiesPlugin.endActivity(_latestActivityId!);
+            }
+          }
+        } catch (e) {
+          if (kDebugMode) {
+            print('ERROR: Unable to create or update iOS LiveCard!');
           }
-        } else {
-          if (_latestActivityId != null) _liveActivitiesPlugin.endActivity(_latestActivityId!);
         }
       }
     }
@@ -139,19 +179,28 @@ class LiveCardProvider extends ChangeNotifier {
       today = _today(_timetable);
     }
 
-    _delay = _settings.bellDelayEnabled ? Duration(seconds: _settings.bellDelay) : Duration.zero;
+    _delay = _settings.bellDelayEnabled
+        ? Duration(seconds: _settings.bellDelay)
+        : Duration.zero;
 
     final now = _now().add(_delay);
 
     // Filter cancelled lessons #20
     // Filter label lessons #128
-    today = today.where((lesson) => lesson.status?.name != "Elmaradt" && lesson.subject.id != '' && !lesson.isEmpty).toList();
+    today = today
+        .where((lesson) =>
+            lesson.status?.name != "Elmaradt" &&
+            lesson.subject.id != '' &&
+            !lesson.isEmpty)
+        .toList();
 
     if (today.isNotEmpty) {
       // sort
       today.sort((a, b) => a.start.compareTo(b.start));
 
-      final _lesson = today.firstWhere((l) => l.start.isBefore(now) && l.end.isAfter(now), orElse: () => Lesson.fromJson({}));
+      final _lesson = today.firstWhere(
+          (l) => l.start.isBefore(now) && l.end.isAfter(now),
+          orElse: () => Lesson.fromJson({}));
 
       if (_lesson.start.year != 0) {
         currentLesson = _lesson;
@@ -159,7 +208,8 @@ class LiveCardProvider extends ChangeNotifier {
         currentLesson = null;
       }
 
-      final _next = today.firstWhere((l) => l.start.isAfter(now), orElse: () => Lesson.fromJson({}));
+      final _next = today.firstWhere((l) => l.start.isAfter(now),
+          orElse: () => Lesson.fromJson({}));
       nextLessons = today.where((l) => l.start.isAfter(now)).toList();
 
       if (_next.start.year != 0) {
@@ -168,7 +218,8 @@ class LiveCardProvider extends ChangeNotifier {
         nextLesson = null;
       }
 
-      final _prev = today.lastWhere((l) => l.end.isBefore(now), orElse: () => Lesson.fromJson({}));
+      final _prev = today.lastWhere((l) => l.end.isBefore(now),
+          orElse: () => Lesson.fromJson({}));
 
       if (_prev.start.year != 0) {
         prevLesson = _prev;
@@ -198,7 +249,10 @@ class LiveCardProvider extends ChangeNotifier {
 
   Duration get delay => _delay;
 
-  bool _sameDate(DateTime a, DateTime b) => (a.year == b.year && a.month == b.month && a.day == b.day);
+  bool _sameDate(DateTime a, DateTime b) =>
+      (a.year == b.year && a.month == b.month && a.day == b.day);
 
-  List<Lesson> _today(TimetableProvider p) => (p.getWeek(Week.current()) ?? []).where((l) => _sameDate(l.date, _now())).toList();
+  List<Lesson> _today(TimetableProvider p) => (p.getWeek(Week.current()) ?? [])
+      .where((l) => _sameDate(l.date, _now()))
+      .toList();
 }

filcnaplo/lib/api/providers/update_provider.dart

@@ -3,6 +3,7 @@ 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
@@ -20,9 +21,11 @@ class UpdateProvider extends ChangeNotifier {
     _releases = List.castFrom(initialReleases);
   }
 
-  static const currentVersion = String.fromEnvironment("APPVER", defaultValue: "1.0");
-
   Future<void> fetch() async {
+    late String currentVersion;
+    PackageInfo packageInfo = await PackageInfo.fromPlatform();
+    currentVersion = packageInfo.version;
+
     if (!Platform.isAndroid) return;
 
     _releases = await FilcAPI.getReleases() ?? [];
@@ -30,10 +33,30 @@ class UpdateProvider extends ChangeNotifier {
 
     // Check for new releases
     if (_releases.isNotEmpty) {
-      _available = _releases.first.version.compareTo(Version.fromString(currentVersion)) == 1;
+      _available = _releases.first.version
+              .compareTo(Version.fromString(currentVersion)) ==
+          1;
       // ignore: avoid_print
       if (_available) print("INFO: New update: ${releases.first.version}");
       notifyListeners();
     }
   }
+
+  Future<Map> installedVersion() async {
+    PackageInfo packageInfo = await PackageInfo.fromPlatform();
+
+    String appName = packageInfo.appName;
+    String packageName = packageInfo.packageName;
+    String version = packageInfo.version;
+    String buildNumber = packageInfo.buildNumber;
+
+    Map<String, String> release = {
+      "app_name": appName,
+      "package_name": packageName,
+      "version": version,
+      "build_number": buildNumber,
+    };
+
+    return release;
+  }
 }

filcnaplo/lib/app.dart

@@ -11,6 +11,7 @@ import 'package:filcnaplo/models/config.dart';
 import 'package:filcnaplo/theme/observer.dart';
 import 'package:filcnaplo/theme/theme.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
+import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -22,13 +23,18 @@ import 'package:provider/provider.dart';
 import 'package:filcnaplo_mobile_ui/common/system_chrome.dart' as mobile;
 import 'package:filcnaplo_mobile_ui/screens/login/login_route.dart' as mobile;
 import 'package:filcnaplo_mobile_ui/screens/login/login_screen.dart' as mobile;
-import 'package:filcnaplo_mobile_ui/screens/navigation/navigation_screen.dart' as mobile;
-import 'package:filcnaplo_mobile_ui/screens/settings/settings_route.dart' as mobile;
-import 'package:filcnaplo_mobile_ui/screens/settings/settings_screen.dart' as mobile;
+import 'package:filcnaplo_mobile_ui/screens/navigation/navigation_screen.dart'
+    as mobile;
+import 'package:filcnaplo_mobile_ui/screens/settings/settings_route.dart'
+    as mobile;
+import 'package:filcnaplo_mobile_ui/screens/settings/settings_screen.dart'
+    as mobile;
 
 // Desktop UI
-import 'package:filcnaplo_desktop_ui/screens/navigation/navigation_screen.dart' as desktop;
-import 'package:filcnaplo_desktop_ui/screens/login/login_screen.dart' as desktop;
+import 'package:filcnaplo_desktop_ui/screens/navigation/navigation_screen.dart'
+    as desktop;
+import 'package:filcnaplo_desktop_ui/screens/login/login_screen.dart'
+    as desktop;
 import 'package:filcnaplo_desktop_ui/screens/login/login_route.dart' as desktop;
 
 // Providers
@@ -36,7 +42,6 @@ import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo_kreta_api/providers/absence_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/event_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/exam_provider.dart';
-import 'package:filcnaplo_kreta_api/providers/grade_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/homework_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/message_provider.dart';
 import 'package:filcnaplo_kreta_api/providers/note_provider.dart';
@@ -52,7 +57,12 @@ class App extends StatelessWidget {
   final UserProvider user;
   final DatabaseProvider database;
 
-  const App({Key? key, required this.database, required this.settings, required this.user}) : super(key: key);
+  const App(
+      {Key? key,
+      required this.database,
+      required this.settings,
+      required this.user})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -65,7 +75,8 @@ class App extends StatelessWidget {
 
     final status = StatusProvider();
     final kreta = KretaClient(user: user, settings: settings, status: status);
-    final timetable = TimetableProvider(user: user, database: database, kreta: kreta);
+    final timetable =
+        TimetableProvider(user: user, database: database, kreta: kreta);
     final premium = PremiumProvider(settings: settings);
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -83,23 +94,44 @@ class App extends StatelessWidget {
         ChangeNotifierProvider<StatusProvider>(create: (_) => status),
         Provider<KretaClient>(create: (_) => kreta),
         Provider<DatabaseProvider>(create: (context) => database),
-        ChangeNotifierProvider<ThemeModeObserver>(create: (context) => ThemeModeObserver(initialTheme: settings.theme)),
-        ChangeNotifierProvider<NewsProvider>(create: (context) => NewsProvider(context: context)),
-        ChangeNotifierProvider<UpdateProvider>(create: (context) => UpdateProvider(context: context)),
+        ChangeNotifierProvider<ThemeModeObserver>(
+            create: (context) =>
+                ThemeModeObserver(initialTheme: settings.theme)),
+        ChangeNotifierProvider<NewsProvider>(
+            create: (context) => NewsProvider(context: context)),
+        ChangeNotifierProvider<UpdateProvider>(
+            create: (context) => UpdateProvider(context: context)),
 
         // User data providers
-        ChangeNotifierProvider<GradeProvider>(create: (_) => GradeProvider(settings: settings, user: user, database: database, kreta: kreta)),
+        ChangeNotifierProvider<GradeProvider>(
+            create: (_) => GradeProvider(
+                settings: settings,
+                user: user,
+                database: database,
+                kreta: kreta)),
         ChangeNotifierProvider<TimetableProvider>(create: (_) => timetable),
-        ChangeNotifierProvider<ExamProvider>(create: (context) => ExamProvider(context: context)),
-        ChangeNotifierProvider<HomeworkProvider>(create: (context) => HomeworkProvider(context: context)),
-        ChangeNotifierProvider<MessageProvider>(create: (context) => MessageProvider(context: context)),
-        ChangeNotifierProvider<NoteProvider>(create: (context) => NoteProvider(context: context)),
-        ChangeNotifierProvider<EventProvider>(create: (context) => EventProvider(context: context)),
-        ChangeNotifierProvider<AbsenceProvider>(create: (context) => AbsenceProvider(context: context)),
+        ChangeNotifierProvider<ExamProvider>(
+            create: (context) => ExamProvider(context: context)),
+        ChangeNotifierProvider<HomeworkProvider>(
+            create: (context) => HomeworkProvider(context: context)),
+        ChangeNotifierProvider<MessageProvider>(
+            create: (context) => MessageProvider(context: context)),
+        ChangeNotifierProvider<NoteProvider>(
+            create: (context) => NoteProvider(context: context)),
+        ChangeNotifierProvider<EventProvider>(
+            create: (context) => EventProvider(context: context)),
+        ChangeNotifierProvider<AbsenceProvider>(
+            create: (context) => AbsenceProvider(context: context)),
 
         ChangeNotifierProvider<GradeCalculatorProvider>(
-            create: (_) => GradeCalculatorProvider(settings: settings, user: user, database: database, kreta: kreta)),
-        ChangeNotifierProvider<LiveCardProvider>(create: (context) => LiveCardProvider(timetable: timetable, settings: settings))
+            create: (_) => GradeCalculatorProvider(
+                settings: settings,
+                user: user,
+                database: database,
+                kreta: kreta)),
+        ChangeNotifierProvider<LiveCardProvider>(
+            create: (context) =>
+                LiveCardProvider(timetable: timetable, settings: settings))
       ],
       child: Consumer<ThemeModeObserver>(
         builder: (context, themeMode, child) {
@@ -110,12 +142,15 @@ class App extends StatelessWidget {
               return MaterialApp(
                 builder: (context, child) {
                   // Limit font size scaling to 1.0
-                  double textScaleFactor = min(MediaQuery.of(context).textScaleFactor, 1.0);
+                  double textScaleFactor =
+                      min(MediaQuery.of(context).textScaleFactor, 1.0);
 
                   return I18n(
-                    initialLocale: Locale(settings.language, settings.language.toUpperCase()),
+                    initialLocale: Locale(
+                        settings.language, settings.language.toUpperCase()),
                     child: MediaQuery(
-                      data: MediaQuery.of(context).copyWith(textScaleFactor: textScaleFactor),
+                      data: MediaQuery.of(context)
+                          .copyWith(textScaleFactor: textScaleFactor),
                       child: child ?? Container(),
                     ),
                   );
@@ -148,7 +183,8 @@ class App extends StatelessWidget {
                   return locale;
                 },
                 onGenerateRoute: (settings) => rootNavigator(settings),
-                initialRoute: user.getUsers().isNotEmpty ? "navigation" : "login",
+                initialRoute:
+                    user.getUsers().isNotEmpty ? "navigation" : "login",
               );
             },
           );
@@ -162,7 +198,8 @@ class App extends StatelessWidget {
     if (Platform.isAndroid || Platform.isIOS) {
       switch (route.name) {
         case "login_back":
-          return CupertinoPageRoute(builder: (context) => const mobile.LoginScreen(back: true));
+          return CupertinoPageRoute(
+              builder: (context) => const mobile.LoginScreen(back: true));
         case "login":
           return _rootRoute(const mobile.LoginScreen());
         case "navigation":
@@ -175,7 +212,8 @@ class App extends StatelessWidget {
     } else if (Platform.isWindows || Platform.isMacOS || Platform.isLinux) {
       switch (route.name) {
         case "login_back":
-          return CupertinoPageRoute(builder: (context) => const desktop.LoginScreen(back: true));
+          return CupertinoPageRoute(
+              builder: (context) => const desktop.LoginScreen(back: true));
         case "login":
           return _rootRoute(const desktop.LoginScreen());
         case "navigation":

filcnaplo/lib/models/config.dart

@@ -9,7 +9,7 @@ class Config {
 
   factory Config.fromJson(Map json) {
     return Config(
-      userAgent: json["user_agent"] ?? "hu.filc.naplo/\$0/\$1/\$2",
+      userAgent: json["user_agent"] ?? "hu.refilc.naplo/\$0/\$1/\$2",
       json: json,
     );
   }

filcnaplo/lib/ui/widgets/grade/grade_tile.dart

@@ -311,7 +311,7 @@ Color gradeColor(
 
   switch (valueInt) {
     case 5:
-      return Color(0xff3d7bf4);
+      return settings.gradeColors[4];
     case 4:
       return settings.gradeColors[3];
     case 3:

filcnaplo/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -9,6 +9,7 @@ import connectivity_plus
 import dynamic_color
 import flutter_acrylic
 import flutter_local_notifications
+import package_info_plus
 import path_provider_foundation
 import share_plus_macos
 import sqflite
@@ -19,6 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
   FlutterAcrylicPlugin.register(with: registry.registrar(forPlugin: "FlutterAcrylicPlugin"))
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
+  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))

filcnaplo/macos/Podfile

@@ -1,40 +1,40 @@
-platform :osx, '10.11'
-
-# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
-ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-
-project 'Runner', {
-  'Debug' => :debug,
-  'Profile' => :release,
-  'Release' => :release,
-}
-
-def flutter_root
-  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
-  unless File.exist?(generated_xcode_build_settings_path)
-    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
-  end
-
-  File.foreach(generated_xcode_build_settings_path) do |line|
-    matches = line.match(/FLUTTER_ROOT\=(.*)/)
-    return matches[1].strip if matches
-  end
-  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
-end
-
-require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
-
-flutter_macos_podfile_setup
-
-target 'Runner' do
-  use_frameworks!
-  use_modular_headers!
-
-  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
-end
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    flutter_additional_macos_build_settings(target)
-  end
-end
+platform :osx, '10.14'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_macos_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_macos_build_settings(target)
+  end
+end

filcnaplo/macos/Podfile.lock

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

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

@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1400"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-               BuildableName = "Felt Diary.app"
-               BlueprintName = "Runner"
-               ReferencedContainer = "container:Runner.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "Felt Diary.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "Felt Diary.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Profile"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "Felt Diary.app"
-            BlueprintName = "Runner"
-            ReferencedContainer = "container:Runner.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1300"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "33CC10EC2044A3C60003C045"
+               BuildableName = "Felt Diary.app"
+               BlueprintName = "Runner"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
+            BuildableName = "Felt Diary.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
+            BuildableName = "Felt Diary.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Profile"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "33CC10EC2044A3C60003C045"
+            BuildableName = "Felt Diary.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

filcnaplo/pubspec.yaml

@@ -3,7 +3,7 @@ description: "Nem hivatalos e-napló alkalmazás az e-Kréta rendszerhez"
 homepage: https://refilc.hu
 publish_to: "none"
 
-version: 4.0.0+198
+version: 4.0.1+205
 
 environment:
   sdk: ">=2.17.0 <3.0.0"
@@ -67,6 +67,7 @@ dependencies:
   animations: ^2.0.1
   background_fetch: ^1.1.5
   flutter_local_notifications: ^14.1.0
+  package_info_plus: ^3.1.2
 
 dev_dependencies:
   flutter_lints: ^2.0.1
@@ -146,11 +147,13 @@ flutter:
           weight: 700
           style: italic
 
-flutter_icons:
-  image_path: assets/icons/ic_launcher.png
+flutter_launcher_icons:
+  image_path: assets/icons/ic_android.png
   android: true
-  ios: true
-  remove_alpha_ios: true
+  adaptive_icon_background: "#3D7BF4"
+  adaptive_icon_foreground: assets/icons/ic_android.png
+  ios: false
+  remove_alpha_ios: false
 
 flutter_native_splash:
   color: "#3D7BF4"

filcnaplo_desktop_ui/lib/pages/grades/grade_subject_view.dart

@@ -26,16 +26,18 @@ import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:provider/provider.dart';
 import 'grades_page.i18n.dart';
-// import 'package:filcnaplo_premium/ui/mobile/goalplanner/new_goal.dart';
+//import 'package:filcnaplo_premium/ui/mobile/goal_planner/new_goal.dart';
 
 class GradeSubjectView extends StatefulWidget {
-  const GradeSubjectView(this.subject, {Key? key, this.groupAverage = 0.0}) : super(key: key);
+  const GradeSubjectView(this.subject, {Key? key, this.groupAverage = 0.0})
+      : super(key: key);
 
   final Subject subject;
   final double groupAverage;
 
   void push(BuildContext context, {bool root = false}) {
-    Navigator.of(context, rootNavigator: root).push(CupertinoPageRoute(builder: (context) => this));
+    Navigator.of(context, rootNavigator: root)
+        .push(CupertinoPageRoute(builder: (context) => this));
   }
 
   @override
@@ -70,7 +72,9 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
     final gradeDates = subjectGrades.map((e) => e.date.millisecondsSinceEpoch);
     final maxGradeDate = gradeDates.fold(0, max);
     final minGradeDate = gradeDates.fold(0, min);
-    if (maxGradeDate - minGradeDate < const Duration(days: 5).inMilliseconds) return false; // naplo/#78
+    if (maxGradeDate - minGradeDate < const Duration(days: 5).inMilliseconds) {
+      return false; // naplo/#78
+    }
 
     return subjectGrades.where((e) => e.type == GradeType.midYear).length > 1;
   }
@@ -129,7 +133,8 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
       ),
     );
 
-    tiles.add(Padding(padding: EdgeInsets.only(bottom: !gradeCalcMode ? 24.0 : 250.0)));
+    tiles.add(Padding(
+        padding: EdgeInsets.only(bottom: !gradeCalcMode ? 24.0 : 250.0)));
     gradeTiles = List.castFrom(tiles);
   }
 
@@ -142,7 +147,10 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
     average = AverageHelper.averageEvals(subjectGrades);
     final prevAvg = subjectGrades.isNotEmpty
         ? AverageHelper.averageEvals(subjectGrades
-            .where((e) => e.date.isBefore(subjectGrades.reduce((v, e) => e.date.isAfter(v.date) ? e : v).date.subtract(const Duration(days: 30))))
+            .where((e) => e.date.isBefore(subjectGrades
+                .reduce((v, e) => e.date.isAfter(v.date) ? e : v)
+                .date
+                .subtract(const Duration(days: 30))))
             .toList())
         : 0.0;
 
@@ -153,14 +161,17 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("annual_average".i18n),
-            if (average != prevAvg) TrendDisplay(current: average, previous: prevAvg),
+            if (average != prevAvg)
+              TrendDisplay(current: average, previous: prevAvg),
           ],
         ),
         child: Container(
           padding: const EdgeInsets.only(top: 12.0, right: 12.0),
           child: Row(
             children: [
-              Expanded(child: GradeGraph(subjectGrades, dayThreshold: 5, classAvg: widget.groupAverage)),
+              Expanded(
+                  child: GradeGraph(subjectGrades,
+                      dayThreshold: 5, classAvg: widget.groupAverage)),
               Padding(
                 padding: const EdgeInsets.only(bottom: 24.0),
                 child: GradesCount(grades: subjectGrades),
@@ -174,7 +185,9 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
     if (!gradeCalcMode) {
       buildTiles(subjectGrades);
     } else {
-      List<Grade> ghostGrades = calculatorProvider.ghosts.where((e) => e.subject == widget.subject).toList();
+      List<Grade> ghostGrades = calculatorProvider.ghosts
+          .where((e) => e.subject == widget.subject)
+          .toList();
       buildTiles(ghostGrades);
     }
 
@@ -182,7 +195,10 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
         key: _scaffoldKey,
         floatingActionButtonLocation: ExpandableFab.location,
         floatingActionButton: Visibility(
-          visible: !gradeCalcMode && subjectGrades.where((e) => e.type == GradeType.midYear).isNotEmpty,
+          visible: !gradeCalcMode &&
+              subjectGrades
+                  .where((e) => e.type == GradeType.midYear)
+                  .isNotEmpty,
           child: ExpandableFab(
             type: ExpandableFabType.up,
             distance: 50,
@@ -215,12 +231,17 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
               },
               navBarItems: [
                 const SizedBox(width: 6.0),
-                if (widget.groupAverage != 0) Center(child: AverageDisplay(average: widget.groupAverage, border: true)),
+                if (widget.groupAverage != 0)
+                  Center(
+                      child: AverageDisplay(
+                          average: widget.groupAverage, border: true)),
                 const SizedBox(width: 6.0),
-                if (average != 0) Center(child: AverageDisplay(average: average)),
+                if (average != 0)
+                  Center(child: AverageDisplay(average: average)),
                 const SizedBox(width: 12.0),
               ],
-              icon: SubjectIcon.resolveVariant(subject: widget.subject, context: context),
+              icon: SubjectIcon.resolveVariant(
+                  subject: widget.subject, context: context),
               scrollController: _scrollController,
               title: widget.subject.renamedTo ?? widget.subject.name.capital(),
               italic: widget.subject.isRenamed,
@@ -240,13 +261,15 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
 
   void gradeCalc(BuildContext context) {
     // Scroll to the top of the page
-    _scrollController.animateTo(75, duration: const Duration(milliseconds: 500), curve: Curves.ease);
+    _scrollController.animateTo(75,
+        duration: const Duration(milliseconds: 500), curve: Curves.ease);
 
     calculatorProvider.clear();
     calculatorProvider.addAllGrades(gradeProvider.grades);
 
     _sheetController = _scaffoldKey.currentState?.showBottomSheet(
-      (context) => RoundedBottomSheet(child: GradeCalculator(widget.subject), borderRadius: 14.0),
+      (context) => RoundedBottomSheet(
+          child: GradeCalculator(widget.subject), borderRadius: 14.0),
       backgroundColor: const Color(0x00000000),
       elevation: 12.0,
     );

filcnaplo_desktop_ui/lib/pages/grades/grades_page.dart

@@ -41,13 +41,21 @@ class _GradesPageState extends State<GradesPage> {
 
   int avgDropValue = 0;
 
-  List<Grade> getSubjectGrades(Subject subject, {int days = 0}) => gradeProvider.grades
-      .where(
-          (e) => e.subject == subject && e.type == GradeType.midYear && (days == 0 || e.date.isBefore(DateTime.now().subtract(Duration(days: days)))))
+  List<Grade> getSubjectGrades(Subject subject, {int days = 0}) => gradeProvider
+      .grades
+      .where((e) =>
+          e.subject == subject &&
+          e.type == GradeType.midYear &&
+          (days == 0 ||
+              e.date.isBefore(DateTime.now().subtract(Duration(days: days)))))
       .toList();
 
   void generateTiles() {
-    List<Subject> subjects = gradeProvider.grades.map((e) => e.subject).toSet().toList()..sort((a, b) => a.name.compareTo(b.name));
+    List<Subject> subjects = gradeProvider.grades
+        .map((e) => e.subject)
+        .toSet()
+        .toList()
+      ..sort((a, b) => a.name.compareTo(b.name));
     List<Widget> tiles = [];
 
     Map<Subject, double> subjectAvgs = {};
@@ -59,11 +67,15 @@ class _GradesPageState extends State<GradesPage> {
       double averageBefore = 0.0;
 
       if (avgDropValue != 0) {
-        List<Grade> gradesBefore = getSubjectGrades(subject, days: avgDropValue);
-        averageBefore = avgDropValue == 0 ? 0.0 : AverageHelper.averageEvals(gradesBefore);
+        List<Grade> gradesBefore =
+            getSubjectGrades(subject, days: avgDropValue);
+        averageBefore =
+            avgDropValue == 0 ? 0.0 : AverageHelper.averageEvals(gradesBefore);
       }
       var nullavg = GroupAverage(average: 0.0, subject: subject, uid: "0");
-      double groupAverage = gradeProvider.groupAverages.firstWhere((e) => e.subject == subject, orElse: () => nullavg).average;
+      double groupAverage = gradeProvider.groupAverages
+          .firstWhere((e) => e.subject == subject, orElse: () => nullavg)
+          .average;
 
       if (avg != 0) subjectAvgs[subject] = avg;
 
@@ -73,7 +85,8 @@ class _GradesPageState extends State<GradesPage> {
         average: avg,
         groupAverage: avgDropValue == 0 ? groupAverage : 0.0,
         onTap: () {
-          GradeSubjectView(subject, groupAverage: groupAverage).push(context, root: true);
+          GradeSubjectView(subject, groupAverage: groupAverage)
+              .push(context, root: true);
         },
       );
     }));
@@ -81,7 +94,12 @@ class _GradesPageState extends State<GradesPage> {
     if (tiles.isNotEmpty) {
       tiles.insert(0, yearlyGraph);
       tiles.insert(1, FailWarning(subjectAvgs: subjectAvgs));
-      tiles.insert(2, PanelTitle(title: Text(avgDropValue == 0 ? "Subjects".i18n : "Subjects_changes".i18n)));
+      tiles.insert(
+          2,
+          PanelTitle(
+              title: Text(avgDropValue == 0
+                  ? "Subjects".i18n
+                  : "Subjects_changes".i18n)));
       tiles.insert(3, const PanelHeader(padding: EdgeInsets.only(top: 12.0)));
       tiles.add(const PanelFooter(padding: EdgeInsets.only(bottom: 12.0)));
       tiles.add(const Padding(padding: EdgeInsets.only(bottom: 24.0)));
@@ -95,9 +113,15 @@ class _GradesPageState extends State<GradesPage> {
       );
     }
 
-    double subjectAvg = subjectAvgs.isNotEmpty ? subjectAvgs.values.fold(0.0, (double a, double b) => a + b) / subjectAvgs.length : 0.0;
+    double subjectAvg = subjectAvgs.isNotEmpty
+        ? subjectAvgs.values.fold(0.0, (double a, double b) => a + b) /
+            subjectAvgs.length
+        : 0.0;
     final double classAvg = gradeProvider.groupAverages.isNotEmpty
-        ? gradeProvider.groupAverages.map((e) => e.average).fold(0.0, (double a, double b) => a + b) / gradeProvider.groupAverages.length
+        ? gradeProvider.groupAverages
+                .map((e) => e.average)
+                .fold(0.0, (double a, double b) => a + b) /
+            gradeProvider.groupAverages.length
         : 0.0;
 
     if (subjectAvg > 0) {
@@ -151,18 +175,31 @@ class _GradesPageState extends State<GradesPage> {
 
     final double totalClassAvg = gradeProvider.groupAverages.isEmpty
         ? 0.0
-        : gradeProvider.groupAverages.map((e) => e.average).fold(0.0, (double a, double b) => a + b) / gradeProvider.groupAverages.length;
+        : gradeProvider.groupAverages
+                .map((e) => e.average)
+                .fold(0.0, (double a, double b) => a + b) /
+            gradeProvider.groupAverages.length;
 
-    final now = gradeProvider.grades.isNotEmpty ? gradeProvider.grades.reduce((v, e) => e.date.isAfter(v.date) ? e : v).date : DateTime.now();
+    final now = gradeProvider.grades.isNotEmpty
+        ? gradeProvider.grades
+            .reduce((v, e) => e.date.isAfter(v.date) ? e : v)
+            .date
+        : DateTime.now();
 
-    final currentStudentAvg = AverageHelper.averageEvals(gradeProvider.grades.where((e) => e.type == GradeType.midYear).toList());
+    final currentStudentAvg = AverageHelper.averageEvals(gradeProvider.grades
+        .where((e) => e.type == GradeType.midYear)
+        .toList());
     final prevStudentAvg = AverageHelper.averageEvals(gradeProvider.grades
         .where((e) => e.type == GradeType.midYear)
         .where((e) => e.date.isBefore(now.subtract(const Duration(days: 30))))
         .toList());
 
     List<Grade> graphGrades = gradeProvider.grades
-        .where((e) => e.type == GradeType.midYear && (avgDropValue == 0 || e.date.isAfter(DateTime.now().subtract(Duration(days: avgDropValue)))))
+        .where((e) =>
+            e.type == GradeType.midYear &&
+            (avgDropValue == 0 ||
+                e.date.isAfter(
+                    DateTime.now().subtract(Duration(days: avgDropValue)))))
         .toList();
 
     yearlyGraph = Padding(
@@ -183,8 +220,12 @@ class _GradesPageState extends State<GradesPage> {
               children: [
                 // if (totalClassAvg >= 1.0) AverageDisplay(average: totalClassAvg, border: true),
                 // const SizedBox(width: 4.0),
-                TrendDisplay(previous: prevStudentAvg, current: currentStudentAvg),
-                if (gradeProvider.grades.where((e) => e.type == GradeType.midYear).isNotEmpty) AverageDisplay(average: currentStudentAvg),
+                TrendDisplay(
+                    previous: prevStudentAvg, current: currentStudentAvg),
+                if (gradeProvider.grades
+                    .where((e) => e.type == GradeType.midYear)
+                    .isNotEmpty)
+                  AverageDisplay(average: currentStudentAvg),
               ],
             )
           ],
@@ -193,7 +234,9 @@ class _GradesPageState extends State<GradesPage> {
           padding: const EdgeInsets.only(top: 12.0, right: 12.0),
           child: Row(
             children: [
-              Expanded(child: GradeGraph(graphGrades, dayThreshold: 2, classAvg: totalClassAvg)),
+              Expanded(
+                  child: GradeGraph(graphGrades,
+                      dayThreshold: 2, classAvg: totalClassAvg)),
               Padding(
                 padding: const EdgeInsets.only(bottom: 24.0),
                 child: GradesCount(grades: graphGrades),
@@ -210,7 +253,8 @@ class _GradesPageState extends State<GradesPage> {
       body: Padding(
         padding: const EdgeInsets.only(top: 9.0),
         child: NestedScrollView(
-          physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
+          physics: const BouncingScrollPhysics(
+              parent: AlwaysScrollableScrollPhysics()),
           headerSliverBuilder: (context, _) => [
             SliverAppBar(
               centerTitle: false,
@@ -223,7 +267,10 @@ class _GradesPageState extends State<GradesPage> {
                 padding: const EdgeInsets.only(left: 8.0),
                 child: Text(
                   "Grades".i18n,
-                  style: TextStyle(color: AppColors.of(context).text, fontSize: 32.0, fontWeight: FontWeight.bold),
+                  style: TextStyle(
+                      color: AppColors.of(context).text,
+                      fontSize: 32.0,
+                      fontWeight: FontWeight.bold),
                 ),
               ),
               shadowColor: Theme.of(context).shadowColor,
@@ -238,7 +285,8 @@ class _GradesPageState extends State<GradesPage> {
               itemCount: max(subjectTiles.length, 1),
               itemBuilder: (context, index) {
                 if (subjectTiles.isNotEmpty) {
-                  EdgeInsetsGeometry panelPadding = const EdgeInsets.symmetric(horizontal: 24.0);
+                  EdgeInsetsGeometry panelPadding =
+                      const EdgeInsets.symmetric(horizontal: 24.0);
 
                   if (subjectTiles[index].runtimeType == GradeSubjectTile) {
                     return Padding(
@@ -248,7 +296,8 @@ class _GradesPageState extends State<GradesPage> {
                           padding: const EdgeInsets.symmetric(horizontal: 8.0),
                         ));
                   } else {
-                    return Padding(padding: panelPadding, child: subjectTiles[index]);
+                    return Padding(
+                        padding: panelPadding, child: subjectTiles[index]);
                   }
                 } else {
                   return Container();

filcnaplo_kreta_api/lib/providers/grade_provider.dart

@@ -6,6 +6,7 @@ import 'package:filcnaplo_kreta_api/client/api.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
 import 'package:filcnaplo_kreta_api/models/grade.dart';
 import 'package:filcnaplo_kreta_api/models/group_average.dart';
+import 'package:filcnaplo_kreta_api/providers/grade_provider.i18n.dart';
 import 'package:flutter/material.dart';
 
 class GradeProvider with ChangeNotifier {
@@ -21,7 +22,8 @@ class GradeProvider with ChangeNotifier {
 
   // Public
   List<Grade> get grades => _grades;
-  DateTime get lastSeenDate => _settings.gradeOpeningFun ? _lastSeen : DateTime(3000);
+  DateTime get lastSeenDate =>
+      _settings.gradeOpeningFun ? _lastSeen : DateTime(3000);
   String get groups => _groups;
   List<GroupAverage> get groupAverages => _groupAvg;
 
@@ -65,7 +67,9 @@ class GradeProvider with ChangeNotifier {
       _groupAvg = await userQuery.getGroupAverages(userId: userId);
       notifyListeners();
       DateTime lastSeenDB = await userQuery.lastSeenGrade(userId: userId);
-      if (lastSeenDB.millisecondsSinceEpoch == 0 || lastSeenDB.year == 0 || !_settings.gradeOpeningFun) {
+      if (lastSeenDB.millisecondsSinceEpoch == 0 ||
+          lastSeenDB.year == 0 ||
+          !_settings.gradeOpeningFun) {
         _lastSeen = DateTime.now();
         await seenAll();
       } else {
@@ -77,13 +81,25 @@ class GradeProvider with ChangeNotifier {
 
   // good student mode, renamed subjects
   Future<void> convertBySettings() async {
-    Map<String, String> renamedSubjects = _settings.renamedSubjectsEnabled ? await _database.userQuery.renamedSubjects(userId: _user.user!.id) : {};
+    Map<String, String> renamedSubjects = _settings.renamedSubjectsEnabled
+        ? await _database.userQuery.renamedSubjects(userId: _user.user!.id)
+        : {};
 
     for (Grade grade in _grades) {
-      grade.subject.renamedTo = renamedSubjects.isNotEmpty ? renamedSubjects[grade.subject.id] : null;
-      grade.value.value = _settings.goodStudent ? 5 : grade.json!["SzamErtek"] ?? 0;
-      grade.value.valueName = _settings.goodStudent ? "Példás" : grade.json!["SzovegesErtek"] ?? "";
-      grade.value.shortName = _settings.goodStudent ? "Példás" : grade.json!["SzovegesErtekelesRovidNev"] ?? "";
+      //grade.subject.renamedTo = renamedSubjects.isNotEmpty ? renamedSubjects[grade.subject.id] : null;
+      grade.subject.renamedTo = null;
+      if (renamedSubjects.isNotEmpty) {
+        grade.subject.name =
+            renamedSubjects[grade.subject.id] ?? grade.subject.name;
+      }
+      grade.value.value =
+          _settings.goodStudent ? 5 : grade.json!["SzamErtek"] ?? 0;
+      grade.value.valueName = _settings.goodStudent
+          ? "Jeles".i18n
+          : grade.json!["SzovegesErtek"].i18n ?? "";
+      grade.value.shortName = _settings.goodStudent
+          ? "Jeles".i18n
+          : grade.json!["SzovegesErtekelesRovidNev"].i18n ?? "";
     }
 
     notifyListeners();
@@ -102,12 +118,16 @@ class GradeProvider with ChangeNotifier {
     if (grades.isNotEmpty || _grades.isNotEmpty) await store(grades);
 
     List? groupsJson = await _kreta.getAPI(KretaAPI.groups(iss));
-    if (groupsJson == null || groupsJson.isEmpty) throw "Cannot fetch Groups for User ${user.id}";
+    if (groupsJson == null || groupsJson.isEmpty)
+      throw "Cannot fetch Groups for User ${user.id}";
     _groups = (groupsJson[0]["OktatasNevelesiFeladat"] ?? {})["Uid"] ?? "";
 
-    List? groupAvgJson = await _kreta.getAPI(KretaAPI.groupAverages(iss, _groups));
-    if (groupAvgJson == null) throw "Cannot fetch Class Averages for User ${user.id}";
-    final groupAvgs = groupAvgJson.map((e) => GroupAverage.fromJson(e)).toList();
+    List? groupAvgJson =
+        await _kreta.getAPI(KretaAPI.groupAverages(iss, _groups));
+    if (groupAvgJson == null)
+      throw "Cannot fetch Class Averages for User ${user.id}";
+    final groupAvgs =
+        groupAvgJson.map((e) => GroupAverage.fromJson(e)).toList();
     await storeGroupAvg(groupAvgs);
   }
 

filcnaplo_kreta_api/lib/providers/grade_provider.i18n.dart

@@ -0,0 +1,33 @@
+import 'package:i18n_extension/i18n_extension.dart';
+
+extension Localization on String {
+  static final _t = Translations.byLocale("hu_hu") +
+      {
+        "en_en": {
+          "Elégtelen": "Fail",
+          "Elégséges": "Warning but passing",
+          "Közepes": "Passed",
+          "Jó": "Good",
+          "Jeles": "Excellent"
+        },
+        "hu_hu": {
+          "Elégtelen": "Elégtelen",
+          "Elégséges": "Elégséges",
+          "Közepes": "Közepes",
+          "Jó": "Jó",
+          "Jeles": "Jeles"
+        },
+        "de_de": {
+          "Elégtelen": "Ungenügend",
+          "Elégséges": "Mangelhaft",
+          "Közepes": "Ausreichend",
+          "Jó": "Befriedigend",
+          "Jeles": "Gut"
+        },
+      };
+
+  String get i18n => localize(this, _t);
+  String fill(List<Object> params) => localizeFill(this, params);
+  String plural(int value) => localizePlural(value, this, _t);
+  String version(Object modifier) => localizeVersion(modifier, this, _t);
+}

filcnaplo_mobile_ui/lib/common/hero_scrollview.dart

@@ -57,7 +57,8 @@ class _HeroScrollViewState extends State<HeroScrollView> {
   Widget build(BuildContext context) {
     return NestedScrollView(
       controller: _scrollController,
-      physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
+      physics:
+          const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
       headerSliverBuilder: (context, _) => [
         SliverAppBar(
           pinned: true,
@@ -70,7 +71,8 @@ class _HeroScrollViewState extends State<HeroScrollView> {
               opacity: showBarTitle ? 1.0 : 0.0,
               child: Row(
                 children: [
-                  Icon(widget.icon, color: AppColors.of(context).text.withOpacity(.8)),
+                  Icon(widget.icon,
+                      color: AppColors.of(context).text.withOpacity(.8)),
                   const SizedBox(width: 8.0),
                   Expanded(
                     child: Text(
@@ -78,7 +80,9 @@ class _HeroScrollViewState extends State<HeroScrollView> {
                       overflow: TextOverflow.ellipsis,
                       maxLines: 2,
                       style: TextStyle(
-                          color: AppColors.of(context).text, fontWeight: FontWeight.w500, fontStyle: widget.italic ? FontStyle.italic : null),
+                          color: AppColors.of(context).text,
+                          fontWeight: FontWeight.w500,
+                          fontStyle: widget.italic ? FontStyle.italic : null),
                     ),
                   ),
                 ],
@@ -94,7 +98,7 @@ class _HeroScrollViewState extends State<HeroScrollView> {
                 }
               }),
           actions: widget.navBarItems,
-          expandedHeight: 124.0,
+          expandedHeight: 145.69,
           stretch: true,
           flexibleSpace: FlexibleSpaceBar(
             background: Stack(

filcnaplo_mobile_ui/lib/common/widgets/homework/homework_tile.dart

@@ -6,7 +6,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 
 class HomeworkTile extends StatelessWidget {
-  const HomeworkTile(this.homework, {Key? key, this.onTap, this.padding, this.censored = false}) : super(key: key);
+  const HomeworkTile(this.homework,
+      {Key? key, this.onTap, this.padding, this.censored = false})
+      : super(key: key);
 
   final Homework homework;
   final void Function()? onTap;
@@ -24,7 +26,8 @@ class HomeworkTile extends StatelessWidget {
           visualDensity: VisualDensity.compact,
           contentPadding: const EdgeInsets.only(left: 8.0, right: 12.0),
           onTap: onTap,
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
+          shape:
+              RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
           leading: SizedBox(
             width: 44,
             height: 44,
@@ -38,7 +41,8 @@ class HomeworkTile extends StatelessWidget {
                 : Padding(
                     padding: const EdgeInsets.only(top: 2.0),
                     child: Icon(
-                      SubjectIcon.resolveVariant(subjectName: homework.subjectName, context: context),
+                      SubjectIcon.resolveVariant(
+                          subjectName: homework.subjectName, context: context),
                       size: 28.0,
                       color: AppColors.of(context).text.withOpacity(.75),
                     ),

filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart

@@ -29,16 +29,18 @@ import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:provider/provider.dart';
 import 'grades_page.i18n.dart';
-// import 'package:filcnaplo_premium/ui/mobile/goalplanner/new_goal.dart';
+// import 'package:filcnaplo_premium/ui/mobile/goal_planner/new_goal.dart';
 
 class GradeSubjectView extends StatefulWidget {
-  const GradeSubjectView(this.subject, {Key? key, this.groupAverage = 0.0}) : super(key: key);
+  const GradeSubjectView(this.subject, {Key? key, this.groupAverage = 0.0})
+      : super(key: key);
 
   final Subject subject;
   final double groupAverage;
 
   void push(BuildContext context, {bool root = false}) {
-    Navigator.of(context, rootNavigator: root).push(CupertinoPageRoute(builder: (context) => this));
+    Navigator.of(context, rootNavigator: root)
+        .push(CupertinoPageRoute(builder: (context) => this));
   }
 
   @override
@@ -73,7 +75,8 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
     final gradeDates = subjectGrades.map((e) => e.date.millisecondsSinceEpoch);
     final maxGradeDate = gradeDates.fold(0, max);
     final minGradeDate = gradeDates.fold(0, min);
-    if (maxGradeDate - minGradeDate < const Duration(days: 5).inMilliseconds) return false; // naplo/#78
+    if (maxGradeDate - minGradeDate < const Duration(days: 5).inMilliseconds)
+      return false; // naplo/#78
 
     return subjectGrades.where((e) => e.type == GradeType.midYear).length > 1;
   }
@@ -139,7 +142,8 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
       ),
     );
 
-    tiles.add(Padding(padding: EdgeInsets.only(bottom: !gradeCalcMode ? 24.0 : 250.0)));
+    tiles.add(Padding(
+        padding: EdgeInsets.only(bottom: !gradeCalcMode ? 24.0 : 250.0)));
     gradeTiles = List.castFrom(tiles);
   }
 
@@ -152,7 +156,10 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
     average = AverageHelper.averageEvals(subjectGrades);
     final prevAvg = subjectGrades.isNotEmpty
         ? AverageHelper.averageEvals(subjectGrades
-            .where((e) => e.date.isBefore(subjectGrades.reduce((v, e) => e.date.isAfter(v.date) ? e : v).date.subtract(const Duration(days: 30))))
+            .where((e) => e.date.isBefore(subjectGrades
+                .reduce((v, e) => e.date.isAfter(v.date) ? e : v)
+                .date
+                .subtract(const Duration(days: 30))))
             .toList())
         : 0.0;
 
@@ -163,12 +170,14 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("annual_average".i18n),
-            if (average != prevAvg) TrendDisplay(current: average, previous: prevAvg),
+            if (average != prevAvg)
+              TrendDisplay(current: average, previous: prevAvg),
           ],
         ),
         child: Container(
           padding: const EdgeInsets.only(top: 16.0, right: 12.0),
-          child: GradeGraph(subjectGrades, dayThreshold: 5, classAvg: widget.groupAverage),
+          child: GradeGraph(subjectGrades,
+              dayThreshold: 5, classAvg: widget.groupAverage),
         ),
       ),
     );
@@ -176,7 +185,9 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
     if (!gradeCalcMode) {
       buildTiles(subjectGrades);
     } else {
-      List<Grade> ghostGrades = calculatorProvider.ghosts.where((e) => e.subject == widget.subject).toList();
+      List<Grade> ghostGrades = calculatorProvider.ghosts
+          .where((e) => e.subject == widget.subject)
+          .toList();
       buildTiles(ghostGrades);
     }
 
@@ -184,7 +195,10 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
         key: _scaffoldKey,
         floatingActionButtonLocation: ExpandableFab.location,
         floatingActionButton: Visibility(
-          visible: !gradeCalcMode && subjectGrades.where((e) => e.type == GradeType.midYear).isNotEmpty,
+          visible: !gradeCalcMode &&
+              subjectGrades
+                  .where((e) => e.type == GradeType.midYear)
+                  .isNotEmpty,
           child: ExpandableFab(
             backgroundColor: Theme.of(context).colorScheme.secondary,
             type: ExpandableFabType.up,
@@ -204,14 +218,19 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
                 child: const Icon(FeatherIcons.flag, size: 20.0),
                 backgroundColor: Theme.of(context).colorScheme.secondary,
                 onPressed: () {
-                  if (!Provider.of<PremiumProvider>(context, listen: false).hasScope(PremiumScopes.goalPlanner)) {
-                    PremiumLockedFeatureUpsell.show(context: context, feature: PremiumFeature.goalplanner);
+                  if (!Provider.of<PremiumProvider>(context, listen: false)
+                      .hasScope(PremiumScopes.goalPlanner)) {
+                    PremiumLockedFeatureUpsell.show(
+                        context: context, feature: PremiumFeature.goalplanner);
                     return;
                   }
 
-                  ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text("Hamarosan...")));
+                  ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(content: Text("Hamarosan...")));
 
-                  // Navigator.of(context).push(CupertinoPageRoute(builder: (context) => PremiumGoalplannerNewGoalScreen(subject: widget.subject)));
+                  //Navigator.of(context).push(CupertinoPageRoute(
+                  //builder: (context) => PremiumGoalplannerNewGoalScreen(
+                  // subject: widget.subject)));
                 },
               ),
             ],
@@ -230,12 +249,17 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
               },
               navBarItems: [
                 const SizedBox(width: 6.0),
-                if (widget.groupAverage != 0) Center(child: AverageDisplay(average: widget.groupAverage, border: true)),
+                if (widget.groupAverage != 0)
+                  Center(
+                      child: AverageDisplay(
+                          average: widget.groupAverage, border: true)),
                 const SizedBox(width: 6.0),
-                if (average != 0) Center(child: AverageDisplay(average: average)),
+                if (average != 0)
+                  Center(child: AverageDisplay(average: average)),
                 const SizedBox(width: 12.0),
               ],
-              icon: SubjectIcon.resolveVariant(subject: widget.subject, context: context),
+              icon: SubjectIcon.resolveVariant(
+                  subject: widget.subject, context: context),
               scrollController: _scrollController,
               title: widget.subject.renamedTo ?? widget.subject.name.capital(),
               italic: widget.subject.isRenamed,
@@ -255,13 +279,15 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
 
   void gradeCalc(BuildContext context) {
     // Scroll to the top of the page
-    _scrollController.animateTo(75, duration: const Duration(milliseconds: 500), curve: Curves.ease);
+    _scrollController.animateTo(75,
+        duration: const Duration(milliseconds: 500), curve: Curves.ease);
 
     calculatorProvider.clear();
     calculatorProvider.addAllGrades(gradeProvider.grades);
 
     _sheetController = _scaffoldKey.currentState?.showBottomSheet(
-      (context) => RoundedBottomSheet(child: GradeCalculator(widget.subject), borderRadius: 14.0),
+      (context) => RoundedBottomSheet(
+          child: GradeCalculator(widget.subject), borderRadius: 14.0),
       backgroundColor: const Color(0x00000000),
       elevation: 12.0,
     );

filcnaplo_mobile_ui/lib/screens/navigation/navbar_item.dart

@@ -5,7 +5,8 @@ class NavItem {
   final Widget icon;
   final Widget activeIcon;
 
-  const NavItem({required this.title, required this.icon, required this.activeIcon});
+  const NavItem(
+      {required this.title, required this.icon, required this.activeIcon});
 }
 
 class NavbarItem extends StatelessWidget {
@@ -25,14 +26,16 @@ class NavbarItem extends StatelessWidget {
     final Widget icon = active ? item.activeIcon : item.icon;
 
     return SafeArea(
-      child: InkWell(
+      child: GestureDetector(
         onTap: onTap,
         child: Padding(
           padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 6.0),
           child: Container(
             padding: const EdgeInsets.all(12.0),
             decoration: BoxDecoration(
-              color: active ? Theme.of(context).colorScheme.secondary.withOpacity(.4) : null,
+              color: active
+                  ? Theme.of(context).colorScheme.secondary.withOpacity(.4)
+                  : null,
               borderRadius: BorderRadius.circular(14.0),
             ),
             child: Stack(
@@ -45,7 +48,9 @@ class NavbarItem extends StatelessWidget {
                 ),
                 IconTheme(
                   data: IconThemeData(
-                    color: Theme.of(context).brightness == Brightness.light ? Colors.black.withOpacity(.5) : Colors.white.withOpacity(.3),
+                    color: Theme.of(context).brightness == Brightness.light
+                        ? Colors.black.withOpacity(.5)
+                        : Colors.white.withOpacity(.3),
                   ),
                   child: icon,
                 ),

filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart

@@ -135,7 +135,7 @@ class NavigationScreenState extends State<NavigationScreen>
 
     initPlatformState();
 
-    HomeWidget.setAppGroupId('hu.filc.naplo.group');
+    HomeWidget.setAppGroupId('hu.refilc.naplo.group');
 
     _checkForWidgetLaunch();
     HomeWidget.widgetClicked.listen(_launchedFromWidget);

filcnaplo_mobile_ui/lib/screens/news/news_screen.dart

@@ -6,6 +6,7 @@ import 'package:filcnaplo_mobile_ui/common/panel/panel.dart';
 import 'package:filcnaplo_mobile_ui/screens/news/news_tile.dart';
 import 'package:filcnaplo/models/news.dart';
 import 'package:filcnaplo_mobile_ui/screens/news/news_view.dart';
+import 'package:filcnaplo_mobile_ui/screens/settings/settings_screen.i18n.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:filcnaplo/api/providers/news_provider.dart';
@@ -24,24 +25,28 @@ class NewsScreen extends StatelessWidget {
       appBar: AppBar(
         surfaceTintColor: Theme.of(context).scaffoldBackgroundColor,
         leading: BackButton(color: AppColors.of(context).text),
-        title: Text("News", style: TextStyle(color: AppColors.of(context).text)),
+        title: Text("news".i18n,
+            style: TextStyle(color: AppColors.of(context).text)),
       ),
       body: SafeArea(
         child: RefreshIndicator(
           onRefresh: () => newsProvider.fetch(),
           child: ListView.builder(
-            physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
+            physics: const BouncingScrollPhysics(
+                parent: AlwaysScrollableScrollPhysics()),
             itemCount: max(news.length, 1),
             itemBuilder: (context, index) {
               if (news.isNotEmpty) {
                 return Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 12.0),
+                  padding: const EdgeInsets.symmetric(
+                      horizontal: 24.0, vertical: 12.0),
                   child: Panel(
                     child: Material(
                       type: MaterialType.transparency,
                       child: NewsTile(
                         news[index],
-                        onTap: () => NewsView.show(news[index], context: context, force: true),
+                        onTap: () => NewsView.show(news[index],
+                            context: context, force: true),
                       ),
                     ),
                   ),

filcnaplo_mobile_ui/lib/screens/settings/privacy_view.dart

@@ -6,7 +6,10 @@ import 'settings_screen.i18n.dart';
 class PrivacyView extends StatelessWidget {
   const PrivacyView({Key? key}) : super(key: key);
 
-  static void show(BuildContext context) => showDialog(context: context, builder: (context) => const PrivacyView(), barrierDismissible: true);
+  static void show(BuildContext context) => showDialog(
+      context: context,
+      builder: (context) => const PrivacyView(),
+      barrierDismissible: true);
 
   @override
   Widget build(BuildContext context) {
@@ -44,7 +47,7 @@ Ha az adataiddal kapcsolatban bármilyen kérdésed van (törlés, módosítás,
 
 Az alkalmazás használatával jelzed, hogy ezt a tájékoztatót tudomásul vetted.
 
-Utolsó módosítás: 2021. 09. 25.
+Utolsó módosítás: 2023. 05. 28.
               """,
                 onOpen: (link) => launch(link.url,
                     customTabsOption: CustomTabsOption(

filcnaplo_mobile_ui/lib/screens/settings/settings_helper.dart

@@ -30,7 +30,11 @@ import 'package:filcnaplo/utils/format.dart';
 import 'package:filcnaplo_premium/ui/mobile/settings/theme.dart';
 
 class SettingsHelper {
-  static const Map<String, String> langMap = {"en": "🇬🇧  English", "hu": "🇭🇺  Magyar", "de": "🇩🇪  Deutsch"};
+  static const Map<String, String> langMap = {
+    "en": "🇬🇧  English",
+    "hu": "🇭🇺  Magyar",
+    "de": "🇩🇪  Deutsch"
+  };
 
   static const Map<Pages, String> pageTitle = {
     Pages.home: "home",
@@ -47,9 +51,11 @@ class SettingsHelper {
     VibrationStrength.strong: "vstrong",
   };
 
-  static Map<Pages, String> localizedPageTitles() => pageTitle.map((key, value) => MapEntry(key, ScreensLocalization(value).i18n));
+  static Map<Pages, String> localizedPageTitles() => pageTitle
+      .map((key, value) => MapEntry(key, ScreensLocalization(value).i18n));
   static Map<VibrationStrength, String> localizedVibrationTitles() =>
-      vibrationTitle.map((key, value) => MapEntry(key, SettingsLocalization(value).i18n));
+      vibrationTitle
+          .map((key, value) => MapEntry(key, SettingsLocalization(value).i18n));
 
   static void language(BuildContext context) {
     showBottomSheetMenu(
@@ -58,7 +64,8 @@ class SettingsHelper {
         String lang = langMap.keys.toList()[index];
         return BottomSheetMenuItem(
           onPressed: () {
-            Provider.of<SettingsProvider>(context, listen: false).update(language: lang);
+            Provider.of<SettingsProvider>(context, listen: false)
+                .update(language: lang);
             I18n.of(context).locale = Locale(lang, lang.toUpperCase());
             Navigator.of(context).maybePop();
             if (Platform.isAndroid || Platform.isIOS) {
@@ -81,6 +88,19 @@ class SettingsHelper {
     );
   }
 
+  static void uwuMode(BuildContext context, value) {
+    final settings = Provider.of<SettingsProvider>(context, listen: false);
+    if (value) {
+      I18n.of(context).locale = const Locale('uw', 'UW');
+    } else {
+      I18n.of(context).locale =
+          Locale(settings.language, settings.language.toUpperCase());
+    }
+    if (Platform.isAndroid || Platform.isIOS) {
+      setupQuickActions();
+    }
+  }
+
   static void iconPack(BuildContext context) {
     final settings = Provider.of<SettingsProvider>(context, listen: false);
     showBottomSheetMenu(
@@ -122,16 +142,20 @@ class SettingsHelper {
       items: List.generate(Pages.values.length, (index) {
         return BottomSheetMenuItem(
           onPressed: () {
-            Provider.of<SettingsProvider>(context, listen: false).update(startPage: Pages.values[index]);
+            Provider.of<SettingsProvider>(context, listen: false)
+                .update(startPage: Pages.values[index]);
             Navigator.of(context).maybePop();
           },
           title: Row(
             children: [
-              Icon(pageIcons[Pages.values[index]], size: 20.0, color: Theme.of(context).colorScheme.secondary),
+              Icon(pageIcons[Pages.values[index]],
+                  size: 20.0, color: Theme.of(context).colorScheme.secondary),
               const SizedBox(width: 16.0),
               Text(localizedPageTitles()[Pages.values[index]] ?? ""),
               const Spacer(),
-              if (Pages.values[index] == Provider.of<SettingsProvider>(context, listen: false).startPage)
+              if (Pages.values[index] ==
+                  Provider.of<SettingsProvider>(context, listen: false)
+                      .startPage)
                 Icon(
                   Icons.check_circle,
                   color: Theme.of(context).colorScheme.secondary,
@@ -165,7 +189,8 @@ class SettingsHelper {
           children: [
             Padding(
               padding: const EdgeInsets.only(right: 16.0),
-              child: Icon(FeatherIcons.smartphone, size: 20.0, color: Theme.of(context).colorScheme.secondary),
+              child: Icon(FeatherIcons.smartphone,
+                  size: 20.0, color: Theme.of(context).colorScheme.secondary),
             ),
             Text(SettingsLocalization("system").i18n),
             const Spacer(),
@@ -183,7 +208,8 @@ class SettingsHelper {
           children: [
             Padding(
               padding: const EdgeInsets.only(right: 16.0),
-              child: Icon(FeatherIcons.sun, size: 20.0, color: Theme.of(context).colorScheme.secondary),
+              child: Icon(FeatherIcons.sun,
+                  size: 20.0, color: Theme.of(context).colorScheme.secondary),
             ),
             Text(SettingsLocalization("light").i18n),
             const Spacer(),
@@ -201,7 +227,8 @@ class SettingsHelper {
           children: [
             Padding(
               padding: const EdgeInsets.only(right: 16.0),
-              child: Icon(FeatherIcons.moon, size: 20.0, color: Theme.of(context).colorScheme.secondary),
+              child: Icon(FeatherIcons.moon,
+                  size: 20.0, color: Theme.of(context).colorScheme.secondary),
             ),
             Text(SettingsLocalization("dark").i18n),
             const Spacer(),
@@ -219,7 +246,8 @@ class SettingsHelper {
   static void accentColor(BuildContext context) {
     Navigator.of(context, rootNavigator: true).push(
       PageRouteBuilder(
-        pageBuilder: (context, _, __) => const PremiumCustomAccentColorSetting(),
+        pageBuilder: (context, _, __) =>
+            const PremiumCustomAccentColorSetting(),
         transitionDuration: Duration.zero,
         reverseTransitionDuration: Duration.zero,
       ),
@@ -241,7 +269,8 @@ class SettingsHelper {
 
         return BottomSheetMenuItem(
           onPressed: () {
-            Provider.of<SettingsProvider>(context, listen: false).update(vibrate: value);
+            Provider.of<SettingsProvider>(context, listen: false)
+                .update(vibrate: value);
             Navigator.of(context).maybePop();
           },
           title: Row(
@@ -250,14 +279,18 @@ class SettingsHelper {
                 width: 12.0,
                 height: 12.0,
                 decoration: BoxDecoration(
-                  color: Theme.of(context).colorScheme.secondary.withOpacity((index + 1) / (vibrationTitle.length + 1)),
+                  color: Theme.of(context)
+                      .colorScheme
+                      .secondary
+                      .withOpacity((index + 1) / (vibrationTitle.length + 1)),
                   shape: BoxShape.circle,
                 ),
               ),
               const SizedBox(width: 16.0),
               Text(localizedVibrationTitles()[value] ?? "?"),
               const Spacer(),
-              if (value == Provider.of<SettingsProvider>(context, listen: false).vibrate)
+              if (value ==
+                  Provider.of<SettingsProvider>(context, listen: false).vibrate)
                 Icon(
                   Icons.check_circle,
                   color: Theme.of(context).colorScheme.secondary,
@@ -291,7 +324,8 @@ class _RoundingSettingState extends State<RoundingSetting> {
   @override
   void initState() {
     super.initState();
-    rounding = Provider.of<SettingsProvider>(context, listen: false).rounding / 10;
+    rounding =
+        Provider.of<SettingsProvider>(context, listen: false).rounding / 10;
   }
 
   @override
@@ -336,12 +370,14 @@ class _RoundingSettingState extends State<RoundingSetting> {
       Row(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          const Text("4.5", style: TextStyle(fontSize: 26.0, fontWeight: FontWeight.w500)),
+          const Text("4.5",
+              style: TextStyle(fontSize: 26.0, fontWeight: FontWeight.w500)),
           const Padding(
             padding: EdgeInsets.symmetric(horizontal: 24.0),
             child: Icon(FeatherIcons.arrowRight, color: Colors.grey),
           ),
-          GradeValueWidget(GradeValue(roundingResult, "", "", 100), fill: true, size: 32.0),
+          GradeValueWidget(GradeValue(roundingResult, "", "", 100),
+              fill: true, size: 32.0),
         ],
       ),
       Padding(
@@ -349,7 +385,8 @@ class _RoundingSettingState extends State<RoundingSetting> {
         child: MaterialActionButton(
           child: Text(SettingsLocalization("done").i18n),
           onPressed: () {
-            Provider.of<SettingsProvider>(context, listen: false).update(rounding: (rounding * 10).toInt());
+            Provider.of<SettingsProvider>(context, listen: false)
+                .update(rounding: (rounding * 10).toInt());
             Navigator.of(context).maybePop();
           },
         ),
@@ -367,15 +404,24 @@ class BellDelaySetting extends StatefulWidget {
   State<BellDelaySetting> createState() => _BellDelaySettingState();
 }
 
-class _BellDelaySettingState extends State<BellDelaySetting> with SingleTickerProviderStateMixin {
+class _BellDelaySettingState extends State<BellDelaySetting>
+    with SingleTickerProviderStateMixin {
   late TabController _tabController;
   late Duration currentDelay;
 
   @override
   void initState() {
     super.initState();
-    _tabController = TabController(length: 2, vsync: this, initialIndex: Provider.of<SettingsProvider>(context, listen: false).bellDelay > 0 ? 1 : 0);
-    currentDelay = Duration(seconds: Provider.of<SettingsProvider>(context, listen: false).bellDelay);
+    _tabController = TabController(
+        length: 2,
+        vsync: this,
+        initialIndex:
+            Provider.of<SettingsProvider>(context, listen: false).bellDelay > 0
+                ? 1
+                : 0);
+    currentDelay = Duration(
+        seconds:
+            Provider.of<SettingsProvider>(context, listen: false).bellDelay);
   }
 
   @override
@@ -416,7 +462,10 @@ class _BellDelaySettingState extends State<BellDelaySetting> with SingleTickerPr
         ),
         Text(SettingsLocalization("sync_help").i18n,
             textAlign: TextAlign.center,
-            style: TextStyle(fontSize: 12.0, fontWeight: FontWeight.w500, color: AppColors.of(context).text.withOpacity(.75))),
+            style: TextStyle(
+                fontSize: 12.0,
+                fontWeight: FontWeight.w500,
+                color: AppColors.of(context).text.withOpacity(.75))),
         Padding(
           padding: const EdgeInsets.only(bottom: 12.0, top: 6.0),
           child: Column(
@@ -425,21 +474,25 @@ class _BellDelaySettingState extends State<BellDelaySetting> with SingleTickerPr
                 backgroundColor: AppColors.of(context).filc,
                 child: Text(SettingsLocalization("sync").i18n),
                 onPressed: () {
-                  final lessonProvider = Provider.of<TimetableProvider>(context, listen: false);
+                  final lessonProvider =
+                      Provider.of<TimetableProvider>(context, listen: false);
 
                   Duration? closest;
                   DateTime now = DateTime.now();
-                  for (var lesson in lessonProvider.getWeek(Week.current()) ?? []) {
+                  for (var lesson
+                      in lessonProvider.getWeek(Week.current()) ?? []) {
                     Duration sdiff = lesson.start.difference(now);
                     Duration ediff = lesson.end.difference(now);
 
-                    if (closest == null || sdiff.abs() < closest.abs()) closest = sdiff;
+                    if (closest == null || sdiff.abs() < closest.abs())
+                      closest = sdiff;
                     if (ediff.abs() < closest.abs()) closest = ediff;
                   }
                   if (closest != null) {
                     if (closest.inHours.abs() >= 1) return;
                     currentDelay = closest;
-                    Provider.of<SettingsProvider>(context, listen: false).update(bellDelay: currentDelay.inSeconds);
+                    Provider.of<SettingsProvider>(context, listen: false)
+                        .update(bellDelay: currentDelay.inSeconds);
                     _tabController.index = currentDelay.inSeconds > 0 ? 1 : 0;
                     setState(() {});
                   }
@@ -449,7 +502,8 @@ class _BellDelaySettingState extends State<BellDelaySetting> with SingleTickerPr
                 child: Text(SettingsLocalization("done").i18n),
                 onPressed: () {
                   //Provider.of<SettingsProvider>(context, listen: false).update(context, rounding: (r * 10).toInt());
-                  Provider.of<SettingsProvider>(context, listen: false).update(bellDelay: currentDelay.inSeconds);
+                  Provider.of<SettingsProvider>(context, listen: false)
+                      .update(bellDelay: currentDelay.inSeconds);
                   Navigator.of(context).maybePop();
                 },
               ),
@@ -513,8 +567,11 @@ class _GradeColorsSettingState extends State<GradeColorsSetting> {
                             children: [
                               MaterialActionButton(
                                 onPressed: () {
-                                  List<Color> colors = List.castFrom(settings.gradeColors);
-                                  var defaultColors = SettingsProvider.defaultSettings().gradeColors;
+                                  List<Color> colors =
+                                      List.castFrom(settings.gradeColors);
+                                  var defaultColors =
+                                      SettingsProvider.defaultSettings()
+                                          .gradeColors;
                                   colors[index] = defaultColors[index];
                                   settings.update(gradeColors: colors);
                                   Navigator.of(context).maybePop();
@@ -523,9 +580,11 @@ class _GradeColorsSettingState extends State<GradeColorsSetting> {
                               ),
                               MaterialActionButton(
                                 onPressed: () {
-                                  List<Color> colors = List.castFrom(settings.gradeColors);
+                                  List<Color> colors =
+                                      List.castFrom(settings.gradeColors);
                                   colors[index] = currentColor.withAlpha(255);
-                                  settings.update(gradeColors: settings.gradeColors);
+                                  settings.update(
+                                      gradeColors: settings.gradeColors);
                                   Navigator.of(context).maybePop();
                                 },
                                 child: Text(SettingsLocalization("done").i18n),
@@ -536,7 +595,8 @@ class _GradeColorsSettingState extends State<GradeColorsSetting> {
                       ]),
                     ).then((value) => setState(() {}));
                   },
-                  child: GradeValueWidget(GradeValue(index + 1, "", "", 0), fill: true, size: 36.0),
+                  child: GradeValueWidget(GradeValue(index + 1, "", "", 0),
+                      fill: true, size: 36.0),
                 ),
               ),
             );

filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart

@@ -51,9 +51,11 @@ class SettingsScreen extends StatefulWidget {
 
 class _SettingsScreenState extends State<SettingsScreen>
     with SingleTickerProviderStateMixin {
-  int devmodeCountdown = 3;
+  int devmodeCountdown = 5;
   bool __ss = false; // secret settings
 
+  Future<Map>? futureRelease;
+
   late UserProvider user;
   late UpdateProvider updateProvider;
   late SettingsProvider settings;
@@ -150,6 +152,9 @@ class _SettingsScreenState extends State<SettingsScreen>
   @override
   void initState() {
     super.initState();
+    Future.delayed(Duration.zero, () {
+      futureRelease = Provider.of<UpdateProvider>(context).installedVersion();
+    });
     _hideContainersController = AnimationController(
         vsync: this, duration: const Duration(milliseconds: 200));
   }
@@ -524,14 +529,34 @@ class _SettingsScreenState extends State<SettingsScreen>
                           contentPadding: const EdgeInsets.only(left: 12.0),
                           shape: RoundedRectangleBorder(
                               borderRadius: BorderRadius.circular(12.0)),
-                          title: const Text("Presentation Mode",
-                              style: TextStyle(fontWeight: FontWeight.w500)),
+                          title: Text("presentation".i18n,
+                              style:
+                                  const TextStyle(fontWeight: FontWeight.w500)),
                           onChanged: (v) =>
                               settings.update(presentationMode: v),
                           value: settings.presentationMode,
                           activeColor: Theme.of(context).colorScheme.secondary,
                         ),
                       ),
+
+                      // UwU-fied mode (why????)
+                      // Material(
+                      //   type: MaterialType.transparency,
+                      //   child: SwitchListTile(
+                      //     contentPadding: const EdgeInsets.only(left: 12.0),
+                      //     shape: RoundedRectangleBorder(
+                      //         borderRadius: BorderRadius.circular(12.0)),
+                      //     title: Text("uwufymode".i18n,
+                      //         style:
+                      //             const TextStyle(fontWeight: FontWeight.w500)),
+                      //     onChanged: (v) {
+                      //       SettingsHelper.uwuMode(context, v);
+                      //       setState(() {});
+                      //     },
+                      //     value: settings.presentationMode,
+                      //     activeColor: Theme.of(context).colorScheme.secondary,
+                      //   ),
+                      // ),
                     ],
                   ),
                 ),
@@ -877,9 +902,36 @@ class _SettingsScreenState extends State<SettingsScreen>
               top: false,
               child: Center(
                 child: GestureDetector(
-                  child: const Panel(
-                      title: Text("v" +
-                          String.fromEnvironment("APPVER", defaultValue: "?"))),
+                  child: FutureBuilder<Map>(
+                    future: futureRelease,
+                    builder: (context, release) {
+                      if (release.hasData) {
+                        return DefaultTextStyle(
+                          style: Theme.of(context)
+                              .textTheme
+                              .titleMedium!
+                              .copyWith(
+                                  fontWeight: FontWeight.w600,
+                                  color: AppColors.of(context)
+                                      .text
+                                      .withOpacity(0.65)),
+                          child: Text("v${release.data!['version']}"),
+                        );
+                      } else {
+                        return DefaultTextStyle(
+                          style: Theme.of(context)
+                              .textTheme
+                              .titleMedium!
+                              .copyWith(
+                                  fontWeight: FontWeight.w600,
+                                  color: AppColors.of(context)
+                                      .text
+                                      .withOpacity(0.65)),
+                          child: const Text("v?"),
+                        );
+                      }
+                    },
+                  ),
                   onTap: () {
                     if (devmodeCountdown > 0) {
                       ScaffoldMessenger.of(context).showSnackBar(SnackBar(

filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart

@@ -41,7 +41,8 @@ extension SettingsLocalization on String {
           "done": "Done",
           "reset": "Reset",
           "open": "Open",
-          "data_collected": "Data collected: Platform (eg. Android), App version (eg. 3.0.0), Unique Install Identifier",
+          "data_collected":
+              "Data collected: Platform (eg. Android), App version (eg. 3.0.0), Unique Install Identifier",
           "Analytics": "Analytics",
           "Anonymous Usage Analytics": "Anonymous Usage Analytics",
           "graph_class_avg": "Class average on graph",
@@ -63,6 +64,8 @@ extension SettingsLocalization on String {
           "Background Color": "Background Color",
           "Highlight Color": "Highlight Color",
           "Adaptive Theme": "Adaptive Theme",
+          "presentation": "Presentation mode",
+          "uwufymode": "UwU-fied mode (hungarian)",
         },
         "hu_hu": {
           "personal_details": "Személyes információk",
@@ -92,7 +95,7 @@ extension SettingsLocalization on String {
           "about": "Névjegy",
           "supporters": "Támogatók",
           "privacy": "Adatvédelmi irányelvek",
-          "licenses": "Licenszek",
+          "licenses": "Licencek",
           "vibrate": "Rezgés",
           "voff": "Kikapcsolás",
           "vlight": "Alacsony",
@@ -102,7 +105,8 @@ extension SettingsLocalization on String {
           "done": "Kész",
           "reset": "Visszaállítás",
           "open": "Megnyitás",
-          "data_collected": "Gyűjtött adat: Platform (pl. Android), App verzió (pl. 3.0.0), Egyedi telepítési azonosító",
+          "data_collected":
+              "Gyűjtött adat: Platform (pl. Android), App verzió (pl. 3.0.0), Egyedi telepítési azonosító",
           "Analytics": "Analitika",
           "Anonymous Usage Analytics": "Névtelen használati analitika",
           "graph_class_avg": "Osztályátlag a grafikonon",
@@ -124,6 +128,8 @@ extension SettingsLocalization on String {
           "Background Color": "Háttér színe",
           "Highlight Color": "Panelek színe",
           "Adaptive Theme": "Adaptív téma",
+          "presentation": "Bemutató mód",
+          "uwufymode": "UwU mód (magyar)",
         },
         "de_de": {
           "personal_details": "Persönliche Angaben",
@@ -163,7 +169,8 @@ extension SettingsLocalization on String {
           "done": "Fertig",
           "reset": "Zurücksetzen",
           "open": "Öffnen",
-          "data_collected": "Erhobene Daten: Plattform (z.B. Android), App version (z.B. 3.0.0), Eindeutige Installationskennung",
+          "data_collected":
+              "Erhobene Daten: Plattform (z.B. Android), App version (z.B. 3.0.0), Eindeutige Installationskennung",
           "Analytics": "Analytik",
           "Anonymous Usage Analytics": "Anonyme Nutzungsanalyse",
           "graph_class_avg": "Klassendurchschnitt in der Grafik",
@@ -184,6 +191,8 @@ extension SettingsLocalization on String {
           "Background Color": "Background Color",
           "Highlight Color": "Highlight Color",
           "Adaptive Theme": "Adaptive Theme",
+          "presentation": "Präsentationsmodus",
+          "uwufymode": "UwU-Modus (ungarisch)",
         },
       };
 

filcnaplo_mobile_ui/pubspec.yaml

@@ -39,6 +39,7 @@ dependencies:
   flutter_svg: ^1.1.6
   background_fetch: ^1.1.5
   wtf_sliding_sheet: ^1.0.0
+  package_info_plus: ^3.1.2
   
 dev_dependencies:
   flutter_lints: ^1.0.0

filcnaplo_premium/android/database/DBManager.java

@@ -1,4 +1,4 @@
-package hu.filc.naplo.database;
+package hu.refilc.naplo.database;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase;
 
 import java.sql.SQLException;
 
-import hu.filc.naplo.database.SQLiteHelper;
+import hu.refilc.naplo.database.SQLiteHelper;
 
 public class DBManager {
     private Context context;