Merge pull request #8 from TMarccci/master

I think I fixed this

.gitignore

@@ -48,3 +48,5 @@ 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/
+ 

.vscode/launch.json

@@ -27,7 +27,7 @@
       "cwd": "filcnaplo",
       "request": "launch",
       "type": "dart",
-      "flutterMode": "release"
+      "flutterMode": "debug"
     }
   ]
 }

README.md

@@ -5,7 +5,7 @@
 
 #### Nem hivatalos e-napló alkalmazás az eKRÉTA rendszerhez - tanulóktól, tanulóknak.
 
-[![Downloads](https://img.shields.io/github/downloads-pre/refilc/naplo/latest/total?color=%23&label=Downloads&logo=github&sort=semver)](https://github.com/refilc/naplo/releases)   [![discord](https://img.shields.io/discord/1111649116020285532?label=Discord)](http://dc.refilc.hu)
+[![Downloads](https://img.shields.io/github/downloads-pre/refilc/naplo/total?color=%23&label=Downloads&logo=github&sort=semver)](https://github.com/refilc/naplo/releases)   [![discord](https://img.shields.io/discord/1111649116020285532?label=Discord)](http://dc.refilc.hu)
 
 ## Setup
 

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

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

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

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

filcnaplo/ios/livecard/lesson_model.swift

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

filcnaplo/ios/livecard/livecard.swift

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

filcnaplo/lib/api/login.dart

@@ -57,14 +57,14 @@ Future loginApi({
   String nonceStr = await Provider.of<KretaClient>(context, listen: false)
       .getAPI(KretaAPI.nonce, json: false);
 
-  Nonce nonce = getNonce(nonceStr, username, instituteCode);
+  Nonce nonce = getNonce(nonceStr, username.replaceAll(' ', '') + ' ', instituteCode);
   headers.addAll(nonce.header());
 
   Map? res = await Provider.of<KretaClient>(context, listen: false)
       .postAPI(KretaAPI.login,
           headers: headers,
           body: User.loginBody(
-            username: username,
+            username: username.replaceAll(' ', '') + ' ',
             password: password,
             instituteCode: instituteCode,
           ));
@@ -83,7 +83,7 @@ Future loginApi({
                   .getAPI(KretaAPI.student(instituteCode));
           Student student = Student.fromJson(studentJson!);
           var user = User(
-            username: username,
+            username: username.replaceAll(' ', '') + ' ',
             password: password,
             instituteCode: instituteCode,
             name: student.name,

filcnaplo/lib/api/providers/live_card_provider.dart

@@ -44,10 +44,20 @@ class LiveCardProvider extends ChangeNotifier {
     required SettingsProvider settings,
   })  : _timetable = timetable,
         _settings = settings {
-    _liveActivitiesPlugin.init(appGroupId: "group.filcnaplo.livecard");
+    // Check if live card is enabled .areActivitiesEnabled()
-    _liveActivitiesPlugin.getAllActivitiesIds().then((value) {
+    _liveActivitiesPlugin.areActivitiesEnabled().then((value) {
-      _latestActivityId = value.isNotEmpty ? value.first : null;
+      // Console log
+      print("Live card enabled: $value");
+
+      if (value) {
+        _liveActivitiesPlugin.init(appGroupId: "group.refilc.livecard");
+
+        _liveActivitiesPlugin.getAllActivitiesIds().then((value) {
+          _latestActivityId = value.isNotEmpty ? value.first : null;
+        });
+      }
     });
+
     _timer = Timer.periodic(const Duration(seconds: 1), (timer) => update());
     _delay = settings.bellDelayEnabled
         ? Duration(seconds: settings.bellDelay)
@@ -58,8 +68,15 @@ class LiveCardProvider extends ChangeNotifier {
   @override
   void dispose() {
     _timer.cancel();
-    if (_latestActivityId != null && Platform.isIOS)
+    if (Platform.isIOS) {
-      _liveActivitiesPlugin.endActivity(_latestActivityId!);
+      _liveActivitiesPlugin.areActivitiesEnabled().then((value) {
+        if (value) {
+          if (_latestActivityId != null) {
+            _liveActivitiesPlugin.endActivity(_latestActivityId!);
+          }
+        }
+      });
+    }
     super.dispose();
   }
 
@@ -146,30 +163,34 @@ class LiveCardProvider extends ChangeNotifier {
 
   void update() async {
     if (Platform.isIOS) {
-      final cmap = toMap();
+      _liveActivitiesPlugin.areActivitiesEnabled().then((value) {
-      if (!mapEquals(cmap, _lastActivity)) {
+        if (value) {
-        _lastActivity = cmap;
+          final cmap = toMap();
-        try {
+          if (!mapEquals(cmap, _lastActivity)) {
-          if (_lastActivity.isNotEmpty) {
+            _lastActivity = cmap;
-            if (_latestActivityId == null) {
+            try {
-              _liveActivitiesPlugin
+              if (_lastActivity.isNotEmpty) {
-                  .createActivity(_lastActivity)
+                if (_latestActivityId == null) {
-                  .then((value) => _latestActivityId = value);
+                  _liveActivitiesPlugin
-            } else {
+                      .createActivity(_lastActivity)
-              _liveActivitiesPlugin.updateActivity(
+                      .then((value) => _latestActivityId = value);
-                  _latestActivityId!, _lastActivity);
+                } else {
+                  _liveActivitiesPlugin.updateActivity(
+                      _latestActivityId!, _lastActivity);
+                }
+              } else {
+                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!);
-            }
-          }
-        } catch (e) {
-          if (kDebugMode) {
-            print('ERROR: Unable to create or update iOS LiveCard!');
           }
         }
-      }
+      });
     }
 
     List<Lesson> today = _today(_timetable);

filcnaplo/lib/helpers/update_helper.dart

@@ -19,13 +19,15 @@ extension UpdateHelper on Release {
     updateCallback!(-1, UpdateState.preparing);
 
     String downloads = await StorageHelper.downloadsPath();
-    File apk = File("$downloads/filcnaplo-$version.apk");
+    File apk = File("$downloads/refilc-$version.apk");
 
     if (!await apk.exists()) {
       updateCallback(-1, UpdateState.downloading);
 
       var bytes = await download(updateCallback: updateCallback);
-      if (!await StorageHelper.write(apk.path, bytes)) throw "failed to write apk: permission denied";
+      if (!await StorageHelper.write(apk.path, bytes)) {
+        throw "failed to write apk: permission denied";
+      }
     }
 
     updateCallback(-1, UpdateState.installing);
@@ -50,7 +52,8 @@ extension UpdateHelper on Release {
     var completer = Completer<Uint8List>();
 
     response?.stream.listen((List<int> chunk) {
-      updateCallback!(downloaded / (response.contentLength ?? 0), UpdateState.downloading);
+      updateCallback!(
+          downloaded / (response.contentLength ?? 0), UpdateState.downloading);
 
       chunks.add(chunk);
       downloaded += chunk.length;

filcnaplo/lib/theme/colors/accent.dart

@@ -10,6 +10,8 @@ enum AccentColor {
   red,
   pink,
   purple,
+  none,
+  ogfilc,
   adaptive,
   custom
 }
@@ -24,6 +26,8 @@ Map<AccentColor, Color> accentColorMap = {
   AccentColor.red: Colors.red.shade300,
   AccentColor.pink: Colors.pink.shade300,
   AccentColor.purple: Colors.purple.shade300,
+  //AccentColor.none: Colors.black,
+  AccentColor.ogfilc: const Color(0xff20AC9B),
   AccentColor.adaptive: const Color(0xFF3D7BF4),
   AccentColor.custom: const Color(0xFF3D7BF4),
 };

filcnaplo/lib/ui/widgets/lesson/lesson_tile.dart

@@ -15,7 +15,8 @@ import 'package:provider/provider.dart';
 import 'lesson_tile.i18n.dart';
 
 class LessonTile extends StatelessWidget {
-  const LessonTile(this.lesson, {Key? key, this.onTap, this.swapDesc = false}) : super(key: key);
+  const LessonTile(this.lesson, {Key? key, this.onTap, this.swapDesc = false})
+      : super(key: key);
 
   final Lesson lesson;
   final bool swapDesc;
@@ -34,7 +35,9 @@ class LessonTile extends StatelessWidget {
     if (RegExp(r'\d').hasMatch(lesson.lessonIndex)) lessonIndexTrailing = ".";
 
     var now = DateTime.now();
-    if (lesson.start.isBefore(now) && lesson.end.isAfter(now) && lesson.status?.name != "Elmaradt") {
+    if (lesson.start.isBefore(now) &&
+        lesson.end.isAfter(now) &&
+        lesson.status?.name != "Elmaradt") {
       fillLeading = true;
     }
 
@@ -62,7 +65,8 @@ class LessonTile extends StatelessWidget {
     if (lesson.homeworkId != "") {
       Homework homework = Provider.of<HomeworkProvider>(context, listen: false)
           .homework
-          .firstWhere((h) => h.id == lesson.homeworkId, orElse: () => Homework.fromJson({}));
+          .firstWhere((h) => h.id == lesson.homeworkId,
+              orElse: () => Homework.fromJson({}));
 
       if (homework.id != "") {
         subtiles.add(LessonSubtile(
@@ -74,11 +78,16 @@ class LessonTile extends StatelessWidget {
     }
 
     if (lesson.exam != "") {
-      Exam exam = Provider.of<ExamProvider>(context, listen: false).exams.firstWhere((t) => t.id == lesson.exam, orElse: () => Exam.fromJson({}));
+      Exam exam = Provider.of<ExamProvider>(context, listen: false)
+          .exams
+          .firstWhere((t) => t.id == lesson.exam,
+              orElse: () => Exam.fromJson({}));
       if (exam.id != "") {
         subtiles.add(LessonSubtile(
           type: LessonSubtileType.exam,
-          title: exam.description != "" ? exam.description : exam.mode?.description ?? "exam".i18n,
+          title: exam.description != ""
+              ? exam.description
+              : exam.mode?.description ?? "exam".i18n,
           onPressed: () => ExamView.show(exam, context: context),
         ));
       }
@@ -87,7 +96,10 @@ class LessonTile extends StatelessWidget {
     String description = '';
     String room = '';
 
-    final cleanDesc = lesson.description.specialChars().toLowerCase().replaceAll(lesson.subject.name.specialChars().toLowerCase(), '');
+    final cleanDesc = lesson.description
+        .specialChars()
+        .toLowerCase()
+        .replaceAll(lesson.subject.name.specialChars().toLowerCase(), '');
 
     if (!swapDesc) {
       if (cleanDesc != "") {
@@ -131,16 +143,23 @@ class LessonTile extends StatelessWidget {
                   // onLongPress: kDebugMode ? () => log(jsonEncode(lesson.json)) : null,
                   visualDensity: VisualDensity.compact,
                   contentPadding: const EdgeInsets.symmetric(horizontal: 4.0),
-                  shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12.0)),
+                  shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(12.0)),
                   title: Text(
-                    !lesson.isEmpty ? lesson.subject.renamedTo ?? lesson.subject.name.capital() : "empty".i18n,
+                    !lesson.isEmpty
+                        ? lesson.subject.renamedTo ??
+                            lesson.subject.name.capital()
+                        : "empty".i18n,
                     maxLines: 2,
                     overflow: TextOverflow.ellipsis,
                     style: TextStyle(
                         fontWeight: FontWeight.w600,
                         fontSize: 15.5,
-                        color: AppColors.of(context).text.withOpacity(!lesson.isEmpty ? 1.0 : 0.5),
+                        color: AppColors.of(context)
-                        fontStyle: lesson.subject.isRenamed ? FontStyle.italic : null),
+                            .text
+                            .withOpacity(!lesson.isEmpty ? 1.0 : 0.5),
+                        fontStyle:
+                            lesson.subject.isRenamed ? FontStyle.italic : null),
                   ),
                   subtitle: description != ""
                       ? Text(
@@ -175,12 +194,20 @@ class LessonTile extends StatelessWidget {
                             offset: const Offset(-12.0, -2.0),
                             child: Container(
                               decoration: BoxDecoration(
-                                color: fillLeading ? Theme.of(context).colorScheme.secondary.withOpacity(.3) : const Color(0x00000000),
+                                color: fillLeading
+                                    ? Theme.of(context)
+                                        .colorScheme
+                                        .secondary
+                                        .withOpacity(.3)
+                                    : const Color(0x00000000),
                                 borderRadius: BorderRadius.circular(12.0),
                                 boxShadow: [
                                   if (fillLeading)
                                     BoxShadow(
-                                      color: Theme.of(context).colorScheme.secondary.withOpacity(.25),
+                                      color: Theme.of(context)
+                                          .colorScheme
+                                          .secondary
+                                          .withOpacity(.25),
                                       blurRadius: 6.0,
                                     )
                                 ],
@@ -210,7 +237,9 @@ class LessonTile extends StatelessWidget {
                                     maxLines: 2,
                                     style: TextStyle(
                                       fontWeight: FontWeight.w500,
-                                      color: AppColors.of(context).text.withOpacity(.75),
+                                      color: AppColors.of(context)
+                                          .text
+                                          .withOpacity(.75),
                                     ),
                                   ),
                                 ),
@@ -225,7 +254,9 @@ class LessonTile extends StatelessWidget {
                                   textAlign: TextAlign.center,
                                   style: TextStyle(
                                     fontWeight: FontWeight.w500,
-                                    color: AppColors.of(context).text.withOpacity(.9),
+                                    color: AppColors.of(context)
+                                        .text
+                                        .withOpacity(.9),
                                   ),
                                 ),
                               ],
@@ -249,7 +280,9 @@ class LessonTile extends StatelessWidget {
 enum LessonSubtileType { homework, exam, absence }
 
 class LessonSubtile extends StatelessWidget {
-  const LessonSubtile({Key? key, this.onPressed, required this.title, required this.type}) : super(key: key);
+  const LessonSubtile(
+      {Key? key, this.onPressed, required this.title, required this.type})
+      : super(key: key);
 
   final Function()? onPressed;
   final String title;
@@ -285,7 +318,8 @@ class LessonSubtile extends StatelessWidget {
               Center(
                 child: SizedBox(
                   width: 30.0,
-                  child: Icon(icon, color: iconColor.withOpacity(.75), size: 20.0),
+                  child:
+                      Icon(icon, color: iconColor.withOpacity(.75), size: 20.0),
                 ),
               ),
               Expanded(
@@ -295,7 +329,9 @@ class LessonSubtile extends StatelessWidget {
                     title.escapeHtml(),
                     maxLines: 1,
                     overflow: TextOverflow.ellipsis,
-                    style: TextStyle(fontWeight: FontWeight.w500, color: AppColors.of(context).text.withOpacity(.65)),
+                    style: TextStyle(
+                        fontWeight: FontWeight.w500,
+                        color: AppColors.of(context).text.withOpacity(.65)),
                   ),
                 ),
               ),

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.1+205
+version: 4.0.4+212
 
 environment:
   sdk: ">=2.17.0 <3.0.0"

filcnaplo_kreta_api/lib/client/client.dart

@@ -169,7 +169,7 @@ class KretaClient {
     Map? loginRes = await postAPI(KretaAPI.login,
         headers: headers,
         body: User.loginBody(
-          username: loginUser.username,
+          username: loginUser.username.replaceAll(' ', '') + ' ',
           password: loginUser.password,
           instituteCode: loginUser.instituteCode,
         ));

filcnaplo_kreta_api/lib/models/homework.dart

@@ -1,5 +1,7 @@
 import 'package:filcnaplo_kreta_api/client/api.dart';
 
+import 'subject.dart';
+
 class Homework {
   Map? json;
   DateTime date;
@@ -9,7 +11,7 @@ class Homework {
   bool homeworkEnabled;
   String teacher;
   String content;
-  String subjectName;
+  Subject subject;
   String group;
   List<HomeworkAttachment> attachments;
   String id;
@@ -22,7 +24,7 @@ class Homework {
     required this.homeworkEnabled,
     required this.teacher,
     required this.content,
-    required this.subjectName,
+    required this.subject,
     required this.group,
     required this.attachments,
     required this.id,
@@ -32,16 +34,27 @@ class Homework {
   factory Homework.fromJson(Map json) {
     return Homework(
       id: json["Uid"] ?? "",
-      date: json["RogzitesIdopontja"] != null ? DateTime.parse(json["RogzitesIdopontja"]).toLocal() : DateTime(0),
+      date: json["RogzitesIdopontja"] != null
-      lessonDate: json["FeladasDatuma"] != null ? DateTime.parse(json["FeladasDatuma"]).toLocal() : DateTime(0),
+          ? DateTime.parse(json["RogzitesIdopontja"]).toLocal()
-      deadline: json["HataridoDatuma"] != null ? DateTime.parse(json["HataridoDatuma"]).toLocal() : DateTime(0),
+          : DateTime(0),
+      lessonDate: json["FeladasDatuma"] != null
+          ? DateTime.parse(json["FeladasDatuma"]).toLocal()
+          : DateTime(0),
+      deadline: json["HataridoDatuma"] != null
+          ? DateTime.parse(json["HataridoDatuma"]).toLocal()
+          : DateTime(0),
       byTeacher: json["IsTanarRogzitette"] ?? true,
       homeworkEnabled: json["IsTanuloHaziFeladatEnabled"] ?? false,
       teacher: (json["RogzitoTanarNeve"] ?? "").trim(),
       content: (json["Szoveg"] ?? "").trim(),
-      subjectName: json["TantargyNeve"] ?? "",
+      subject: Subject.fromJson(json["Tantargy"] ?? {}),
-      group: json["OsztalyCsoport"] != null ? json["OsztalyCsoport"]["Uid"] ?? "" : "",
+      group: json["OsztalyCsoport"] != null
-      attachments: ((json["Csatolmanyok"] ?? []) as List).cast<Map>().map((Map json) => HomeworkAttachment.fromJson(json)).toList(),
+          ? json["OsztalyCsoport"]["Uid"] ?? ""
+          : "",
+      attachments: ((json["Csatolmanyok"] ?? []) as List)
+          .cast<Map>()
+          .map((Map json) => HomeworkAttachment.fromJson(json))
+          .toList(),
       json: json,
     );
   }
@@ -53,7 +66,8 @@ class HomeworkAttachment {
   String name;
   String type;
 
-  HomeworkAttachment({required this.id, this.name = "", this.type = "", this.json});
+  HomeworkAttachment(
+      {required this.id, this.name = "", this.type = "", this.json});
 
   factory HomeworkAttachment.fromJson(Map json) {
     return HomeworkAttachment(
@@ -64,6 +78,8 @@ class HomeworkAttachment {
     );
   }
 
-  String downloadUrl(String iss) => KretaAPI.downloadHomeworkAttachments(iss, id, type);
+  String downloadUrl(String iss) =>
-  bool get isImage => name.endsWith(".jpg") || name.endsWith(".jpeg") || name.endsWith(".png");
+      KretaAPI.downloadHomeworkAttachments(iss, id, type);
+  bool get isImage =>
+      name.endsWith(".jpg") || name.endsWith(".jpeg") || name.endsWith(".png");
 }

filcnaplo_kreta_api/lib/providers/grade_provider.dart

@@ -86,20 +86,21 @@ class GradeProvider with ChangeNotifier {
         : {};
 
     for (Grade grade in _grades) {
-      //grade.subject.renamedTo = renamedSubjects.isNotEmpty ? renamedSubjects[grade.subject.id] : null;
+      grade.subject.renamedTo =
-      grade.subject.renamedTo = null;
+          renamedSubjects.isNotEmpty ? renamedSubjects[grade.subject.id] : 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.json!["SzovegesErtek"]}'
+              .replaceAll(RegExp(r'[(]+[12345]?[)]'), '')
+              .i18n;
       grade.value.shortName = _settings.goodStudent
           ? "Jeles".i18n
-          : grade.json!["SzovegesErtekelesRovidNev"].i18n ?? "";
+          : '${grade.json!["SzovegesErtekelesRovidNev"]}' != "null" && '${grade.json!["SzovegesErtekelesRovidNev"]}' != "-" && '${grade.json!["SzovegesErtekelesRovidNev"]}'.replaceAll(RegExp(r'[0123456789]+[%]?'), '') != ""
+              ? '${grade.json!["SzovegesErtekelesRovidNev"]}'.i18n
+              : grade.value.valueName;
     }
 
     notifyListeners();

filcnaplo_kreta_api/lib/providers/homework_provider.dart

@@ -1,5 +1,6 @@
 import 'package:filcnaplo/api/providers/user_provider.dart';
 import 'package:filcnaplo/api/providers/database_provider.dart';
+import 'package:filcnaplo/models/settings.dart';
 import 'package:filcnaplo/models/user.dart';
 import 'package:filcnaplo_kreta_api/client/api.dart';
 import 'package:filcnaplo_kreta_api/client/client.dart';
@@ -8,6 +9,12 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 class HomeworkProvider with ChangeNotifier {
+  // Private
+  late final SettingsProvider _settings;
+  late final UserProvider _user;
+  late final DatabaseProvider _database;
+
+  // Public
   late List<Homework> _homework;
   late BuildContext _context;
   List<Homework> get homework => _homework;
@@ -27,25 +34,54 @@ class HomeworkProvider with ChangeNotifier {
 
     // Load homework from the database
     if (userId != null) {
-      var dbHomework = await Provider.of<DatabaseProvider>(_context, listen: false).userQuery.getHomework(userId: userId);
+      var dbHomework =
+          await Provider.of<DatabaseProvider>(_context, listen: false)
+              .userQuery
+              .getHomework(userId: userId);
       _homework = dbHomework;
-      notifyListeners();
+      await convertBySettings();
     }
   }
 
+  Future<void> convertBySettings() async {
+    Map<String, String> renamedSubjects =
+        (await _database.query.getSettings(_database)).renamedSubjectsEnabled
+            ? await _database.userQuery.renamedSubjects(userId: _user.id!)
+            : {};
+
+    for (Homework homework in _homework) {
+      homework.subject.renamedTo = renamedSubjects.isNotEmpty
+          ? renamedSubjects[homework.subject.id]
+          : null;
+    }
+
+    notifyListeners();
+  }
+
   // Fetches Homework from the Kreta API then stores them in the database
   Future<void> fetch({DateTime? from, bool db = true}) async {
     User? user = Provider.of<UserProvider>(_context, listen: false).user;
     if (user == null) throw "Cannot fetch Homework for User null";
 
     String iss = user.instituteCode;
-    List? homeworkJson = await Provider.of<KretaClient>(_context, listen: false).getAPI(KretaAPI.homework(iss, start: from));
+    List? homeworkJson = await Provider.of<KretaClient>(_context, listen: false)
+        .getAPI(KretaAPI.homework(iss, start: from));
     if (homeworkJson == null) throw "Cannot fetch Homework for User ${user.id}";
 
     List<Homework> homework = [];
     await Future.forEach(homeworkJson.cast<Map>(), (Map hw) async {
-      Map? e = await Provider.of<KretaClient>(_context, listen: false).getAPI(KretaAPI.homework(iss, id: hw["Uid"]));
+      Map? e = await Provider.of<KretaClient>(_context, listen: false)
-      if (e != null) homework.add(Homework.fromJson(e));
+          .getAPI(KretaAPI.homework(iss, id: hw["Uid"]));
+      Map<String, String> renamedSubjects = _settings.renamedSubjectsEnabled
+          ? await _database.userQuery.renamedSubjects(userId: _user.user!.id)
+          : {};
+
+      if (e != null) {
+        Homework hw = Homework.fromJson(e);
+        hw.subject.renamedTo =
+            renamedSubjects.isNotEmpty ? renamedSubjects[hw.subject.id] : null;
+        homework.add(hw);
+      }
     });
 
     if (homework.isEmpty && _homework.isEmpty) return;
@@ -60,6 +96,8 @@ class HomeworkProvider with ChangeNotifier {
     User? user = Provider.of<UserProvider>(_context, listen: false).user;
     if (user == null) throw "Cannot store Homework for User null";
     String userId = user.id;
-    await Provider.of<DatabaseProvider>(_context, listen: false).userStore.storeHomework(homework, userId: userId);
+    await Provider.of<DatabaseProvider>(_context, listen: false)
+        .userStore
+        .storeHomework(homework, userId: userId);
   }
 }

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

@@ -42,7 +42,7 @@ class HomeworkTile extends StatelessWidget {
                     padding: const EdgeInsets.only(top: 2.0),
                     child: Icon(
                       SubjectIcon.resolveVariant(
-                          subjectName: homework.subjectName, context: context),
+                          subjectName: homework.subject.name, context: context),
                       size: 28.0,
                       color: AppColors.of(context).text.withOpacity(.75),
                     ),
@@ -62,7 +62,7 @@ class HomeworkTile extends StatelessWidget {
                   ],
                 )
               : Text(
-                  homework.subjectName.capital(),
+                  homework.subject.renamedTo ?? homework.subject.name.capital(),
                   maxLines: 2,
                   overflow: TextOverflow.ellipsis,
                   style: const TextStyle(fontWeight: FontWeight.w600),

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

@@ -40,11 +40,12 @@ class HomeworkView extends StatelessWidget {
           // Header
           ListTile(
             leading: Icon(
-              SubjectIcon.resolveVariant(subjectName: homework.subjectName, context: context),
+              SubjectIcon.resolveVariant(
+                  subjectName: homework.subject.name, context: context),
               size: 36.0,
             ),
             title: Text(
-              homework.subjectName.capital(),
+              homework.subject.renamedTo ?? homework.subject.name.capital(),
               maxLines: 1,
               overflow: TextOverflow.ellipsis,
               style: const TextStyle(fontWeight: FontWeight.w600),
@@ -62,9 +63,13 @@ class HomeworkView extends StatelessWidget {
           ),
 
           // Details
-          if (homework.deadline.year != 0) Detail(title: "deadline".i18n, description: homework.deadline.format(context)),
+          if (homework.deadline.year != 0)
+            Detail(
+                title: "deadline".i18n,
+                description: homework.deadline.format(context)),
           Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 18.0, vertical: 6.0),
+            padding:
+                const EdgeInsets.symmetric(horizontal: 18.0, vertical: 6.0),
             child: SelectableLinkify(
               text: homework.content.escapeHtml(),
               options: const LinkifyOptions(looseUrl: true, removeWww: true),

filcnaplo_mobile_ui/lib/pages/absences/absences_page.dart

@@ -182,11 +182,15 @@ class _AbsencesPageState extends State<AbsencesPage>
                       fontWeight: FontWeight.bold),
                 ),
               ),
-              bottom: FilterBar(items: [
+              bottom: FilterBar(
-                Tab(text: "Absences".i18n),
+                items: [
-                Tab(text: "Delays".i18n),
+                  Tab(text: "Absences".i18n),
-                Tab(text: "Misses".i18n),
+                  Tab(text: "Delays".i18n),
-              ], controller: _tabController, disableFading: true),
+                  Tab(text: "Misses".i18n),
+                ],
+                controller: _tabController,
+                disableFading: true,
+              ),
             ),
           ],
           body: TabBarView(

filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart

@@ -20,9 +20,6 @@ import 'package:filcnaplo_mobile_ui/pages/grades/calculator/grade_calculator_pro
 import 'package:filcnaplo_mobile_ui/pages/grades/grades_count.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/graph.dart';
 import 'package:filcnaplo_mobile_ui/pages/grades/subject_grades_container.dart';
-import 'package:filcnaplo_premium/models/premium_scopes.dart';
-import 'package:filcnaplo_premium/providers/premium_provider.dart';
-import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
@@ -75,8 +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)
+    if (maxGradeDate - minGradeDate < const Duration(days: 5).inMilliseconds) {
       return false; // naplo/#78
+    }
 
     return subjectGrades.where((e) => e.type == GradeType.midYear).length > 1;
   }
@@ -214,25 +212,25 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
                   gradeCalc(context);
                 },
               ),
-              FloatingActionButton.small(
+              // FloatingActionButton.small(
-                child: const Icon(FeatherIcons.flag, size: 20.0),
+              //  child: const Icon(FeatherIcons.flag, size: 20.0),
-                backgroundColor: Theme.of(context).colorScheme.secondary,
+              //  backgroundColor: Theme.of(context).colorScheme.secondary,
-                onPressed: () {
+              //  onPressed: () {
-                  if (!Provider.of<PremiumProvider>(context, listen: false)
+              //    if (!Provider.of<PremiumProvider>(context, listen: false)
-                      .hasScope(PremiumScopes.goalPlanner)) {
+              //        .hasScope(PremiumScopes.goalPlanner)) {
-                    PremiumLockedFeatureUpsell.show(
+              //      PremiumLockedFeatureUpsell.show(
-                        context: context, feature: PremiumFeature.goalplanner);
+              //          context: context, feature: PremiumFeature.goalplanner);
-                    return;
+              //      return;
-                  }
+              //    }
 
-                  ScaffoldMessenger.of(context).showSnackBar(
+              //    ScaffoldMessenger.of(context).showSnackBar(
-                      const SnackBar(content: Text("Hamarosan...")));
+              //        const SnackBar(content: Text("Hamarosan...")));
 
-                  //Navigator.of(context).push(CupertinoPageRoute(
+              //    Navigator.of(context).push(CupertinoPageRoute(
-                  //builder: (context) => PremiumGoalplannerNewGoalScreen(
+              //      builder: (context) => PremiumGoalplannerNewGoalScreen(
-                  // subject: widget.subject)));
+              //      subject: widget.subject)));
-                },
+              //    },
-              ),
+              // ),
             ],
           ),
         ),

filcnaplo_mobile_ui/lib/pages/grades/graph.dart

@@ -270,6 +270,7 @@ class _GradeGraphState extends State<GradeGraph> {
                                 tData.sort((a, b) => a.writeDate.compareTo(b.writeDate));
                                 return tData.first.writeDate.add(const Duration(days: 120)).isBefore(tData.last.writeDate) ? 2.0 : 1.0;
                               }(),
+                              checkToShowTitle: (double minValue, double maxValue, SideTitles sideTitles, double appliedInterval, double value) { if (value == maxValue || value == minValue) return false; return true; },
                             ),
                             leftTitles: SideTitles(
                               showTitles: true,

filcnaplo_mobile_ui/lib/pages/home/home_page.dart

@@ -249,6 +249,7 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
                                 Tab(text: "Absences".i18n),
                               ],
                               controller: _tabController,
+                              disableFading: true,
                               onTap: (i) async {
                                 int selectedPage =
                                     _pageController.page!.round();

filcnaplo_mobile_ui/lib/pages/home/home_page.i18n.dart

@@ -11,7 +11,7 @@ extension Localization on String {
           "happybirthday": "🎂 Happy birthday, %s!",
           "merryxmas": "🎄 Merry Christmas, %s!",
           "happynewyear": "🎉 Happy New Year, %s!",
-          "refilcopen": "🎈 Welcome in reFilc, %s!",
+          "refilcopen": "🎈 reFilc is 1 year old, %s!",
           "empty": "Nothing to see here.",
           "All": "All",
           "Grades": "Grades",
@@ -30,7 +30,7 @@ extension Localization on String {
           "happybirthday": "🎂 Boldog születésnapot, %s!",
           "merryxmas": "🎄 Boldog Karácsonyt, %s!",
           "happynewyear": "🎉 Boldog új évet, %s!",
-          "refilcopen": "🎈 Üdv a reFilc-ben, %s!",
+          "refilcopen": "🎈 1 éves a reFilc, %s!",
           "empty": "Nincs itt semmi látnivaló.",
           "All": "Összes",
           "Grades": "Jegyek",
@@ -49,7 +49,7 @@ extension Localization on String {
           "happybirthday": "🎂 Alles Gute zum Geburtstag, %s!",
           "merryxmas": "🎄 Frohe Weihnachten, %s!",
           "happynewyear": "🎉 Frohes neues Jahr, %s!",
-          "refilcopen": "🎈 Willkommen bei reFilc, %s!",
+          "refilcopen": "🎈 reFilc ist 1 Jahr alt, %s!",
           "empty": "Hier gibt es nichts zu sehen.",
           "All": "Alles",
           "Grades": "Noten",

filcnaplo_mobile_ui/lib/pages/messages/messages_page.dart

@@ -90,12 +90,16 @@ class _MessagesPageState extends State<MessagesPage>
                       fontWeight: FontWeight.bold),
                 ),
               ),
-              bottom: FilterBar(items: [
+              bottom: FilterBar(
-                Tab(text: "Inbox".i18n),
+                items: [
-                Tab(text: "Sent".i18n),
+                  Tab(text: "Inbox".i18n),
-                Tab(text: "Trash".i18n),
+                  Tab(text: "Sent".i18n),
-                Tab(text: "Draft".i18n),
+                  Tab(text: "Trash".i18n),
-              ], controller: tabController),
+                  Tab(text: "Draft".i18n),
+                ],
+                controller: tabController,
+                disableFading: true,
+              ),
             ),
           ],
           body: TabBarView(

filcnaplo_mobile_ui/lib/screens/login/school_input/school_input_tile.dart

@@ -2,7 +2,8 @@ import 'package:filcnaplo_kreta_api/models/school.dart';
 import 'package:flutter/material.dart';
 
 class SchoolInputTile extends StatelessWidget {
-  const SchoolInputTile({Key? key, required this.school, this.onTap}) : super(key: key);
+  const SchoolInputTile({Key? key, required this.school, this.onTap})
+      : super(key: key);
 
   final School school;
   final Function()? onTap;

filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart

@@ -173,8 +173,7 @@ class NavigationScreenState extends State<NavigationScreen>
   @override
   void didChangePlatformBrightness() {
     if (settings.theme == ThemeMode.system) {
-      Brightness? brightness =
+      Brightness? brightness = MediaQuery.of(context).platformBrightness;
-          WidgetsBinding.instance.window.platformBrightness;
       Provider.of<ThemeModeObserver>(context, listen: false).changeTheme(
           brightness == Brightness.light ? ThemeMode.light : ThemeMode.dark);
     }

filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart

@@ -634,7 +634,7 @@ class _SettingsScreenState extends State<SettingsScreen>
                                   ? Theme.of(context).colorScheme.secondary
                                   : AppColors.of(context).text.withOpacity(.25),
                             ),
-                            const SizedBox(width: 24.0),
+                            const SizedBox(width: 14.0),
                             Expanded(
                               child: Text(
                                 "graph_class_avg".i18n,
@@ -679,7 +679,7 @@ class _SettingsScreenState extends State<SettingsScreen>
                               ? Theme.of(context).colorScheme.secondary
                               : AppColors.of(context).text.withOpacity(.25),
                         ),
-                        const SizedBox(width: 24.0),
+                        const SizedBox(width: 14.0),
                         Expanded(
                           child: Text(
                             "news".i18n,
@@ -724,7 +724,7 @@ class _SettingsScreenState extends State<SettingsScreen>
                                   ? Theme.of(context).colorScheme.secondary
                                   : AppColors.of(context).text.withOpacity(.25),
                             ),
-                            const SizedBox(width: 24.0),
+                            const SizedBox(width: 14.0),
                             Expanded(
                               child: Text(
                                 "surprise_grades".i18n,

filcnaplo_mobile_ui/lib/screens/summary/pages/grades_page.dart

@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+class GradesBody extends StatelessWidget {
+  const GradesBody({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Column();
+  }
+}

filcnaplo_mobile_ui/lib/screens/summary/pages/personality_page.dart

@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+class PersonalityBody extends StatelessWidget {
+  const PersonalityBody({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Column();
+  }
+}

filcnaplo_mobile_ui/lib/screens/summary/summary_screen.dart

@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+import 'pages/grades_page.dart';
+
+class SummaryScreen extends StatefulWidget {
+  final String currentPage;
+
+  const SummaryScreen({Key? key, this.currentPage = 'personality'})
+      : super(key: key);
+
+  @override
+  _SummaryScreenState createState() => _SummaryScreenState();
+}
+
+class _SummaryScreenState extends State<SummaryScreen> {
+  final LinearGradient _backgroundGradient = const LinearGradient(
+    colors: [
+      Color(0xff1d56ac),
+      Color(0xff170a3d),
+    ],
+    begin: Alignment(-0.8, -1.0),
+    end: Alignment(0.8, 1.0),
+    stops: [-1.0, 1.0],
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: BoxDecoration(gradient: _backgroundGradient),
+        child: Container(
+          decoration: BoxDecoration(gradient: _backgroundGradient),
+          width: MediaQuery.of(context).size.width,
+          height: MediaQuery.of(context).size.height,
+          child: SafeArea(
+            child: Padding(
+              padding: EdgeInsets.only(
+                left: 24.0,
+                right: 24.0,
+                top: 26.0 + MediaQuery.of(context).padding.top,
+                bottom: 52.0,
+              ),
+              child: widget.currentPage == 'grades'
+                  ? const GradesBody()
+                  : widget.currentPage == 'lessons'
+                      ? const GradesBody()
+                      : widget.currentPage == 'allsum'
+                          ? const GradesBody()
+                          : const GradesBody(),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

filcnaplo_mobile_ui/lib/screens/summary/summary_screen.i18n.dart

@@ -0,0 +1,15 @@
+import 'package:i18n_extension/i18n_extension.dart';
+
+extension SettingsLocalization on String {
+  static final _t = Translations.byLocale("hu_hu") +
+      {
+        "en_en": {},
+        "hu_hu": {},
+        "de_de": {},
+      };
+
+  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_premium/lib/ui/mobile/grades/average_selector.dart

@@ -9,44 +9,55 @@ import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:provider/provider.dart';
 
 final Map<int, String> avgDropItems = {
-  0: "annual_average".i18n,
+  0: "annual_average",
-  90: "3_months_average".i18n,
+  90: "3_months_average",
-  30: "30_days_average".i18n,
+  30: "30_days_average",
-  14: "14_days_average".i18n,
+  14: "14_days_average",
-  7: "7_days_average".i18n,
+  7: "7_days_average",
 };
 
-class PremiumAverageSelector extends StatelessWidget {
+class PremiumAverageSelector extends StatefulWidget {
   const PremiumAverageSelector({Key? key, this.onChanged, required this.value}) : super(key: key);
 
   final Function(int?)? onChanged;
   final int value;
 
+  @override
+  _PremiumAverageSelectorState createState() => _PremiumAverageSelectorState();
+}
+
+class _PremiumAverageSelectorState extends State<PremiumAverageSelector> {
   @override
   Widget build(BuildContext context) {
+    List<DropdownMenuItem<int>> dropdownItems = avgDropItems.keys.map((item) {
+      return DropdownMenuItem<int>(
+        value: item,
+        child: Text(
+          avgDropItems[item]!.i18n,
+          style: TextStyle(
+            fontSize: 14,
+            fontWeight: FontWeight.bold,
+            color: AppColors.of(context).text,
+          ),
+          overflow: TextOverflow.ellipsis,
+        ),
+      );
+    }).toList();
+
     return DropdownButton2<int>(
-      items: avgDropItems.keys
+      items: dropdownItems,
-          .map((item) => DropdownMenuItem<int>(
-                value: item,
-                child: Text(
-                  avgDropItems[item] ?? "",
-                  style: TextStyle(
-                    fontSize: 14,
-                    fontWeight: FontWeight.bold,
-                    color: AppColors.of(context).text,
-                  ),
-                  overflow: TextOverflow.ellipsis,
-                ),
-              ))
-          .toList(),
       onChanged: (int? value) {
         if (Provider.of<PremiumProvider>(context, listen: false).hasScope(PremiumScopes.gradeStats)) {
-          if (onChanged != null) onChanged!(value);
+          if (widget.onChanged != null) {
+            setState(() {
+              widget.onChanged!(value);
+            });
+          }
         } else {
           PremiumLockedFeatureUpsell.show(context: context, feature: PremiumFeature.gradestats);
         }
       },
-      value: value,
+      value: widget.value,
       iconSize: 14,
       iconEnabledColor: AppColors.of(context).text,
       iconDisabledColor: AppColors.of(context).text,
@@ -71,11 +82,13 @@ class PremiumAverageSelector extends StatelessWidget {
         height: 30,
         child: Row(
           children: [
-            Text(avgDropItems[value] ?? "",
+            Text(
-                style: Theme.of(context)
+              avgDropItems[widget.value]!.i18n,
-                    .textTheme
+              style: Theme.of(context)
-                    .titleSmall!
+                  .textTheme
-                    .copyWith(fontWeight: FontWeight.w600, color: AppColors.of(context).text.withOpacity(0.65))),
+                  .titleSmall!
+                  .copyWith(fontWeight: FontWeight.w600, color: AppColors.of(context).text.withOpacity(0.65)),
+            ),
             const SizedBox(
               width: 4,
             ),

filcnaplo_premium/lib/ui/mobile/settings/theme.dart

@@ -307,6 +307,7 @@ class _PremiumCustomAccentColorSettingState
                                           controller: _testTabController,
                                           padding: EdgeInsets.zero,
                                           censored: true,
+                                          disableFading: true,
                                         ),
                                       ),
                                       Padding(

filcnaplo_premium/lib/ui/mobile/settings/theme.i18n.dart

@@ -19,7 +19,7 @@ extension SettingsLocalization on String {
           "colorpicker_panels": "Panelek",
           "colorpicker_accent": "Színtónus",
           "need_sub": "A módosításhoz Kupak szintű támogatás szükséges.",
-          "advanced": "Fejlett",
+          "advanced": "Haladó",
         },
         "de_de": {
           "theme_prev": "Vorschau",

filcnaplo_premium/lib/ui/mobile/timetable/fs_timetable.dart

@@ -27,7 +27,6 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
 
     SystemChrome.setPreferredOrientations([
       DeviceOrientation.landscapeLeft,
-      DeviceOrientation.landscapeRight,
     ]);
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
     SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
@@ -51,39 +50,32 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
         (a, b) => math.max(
             a, b.where((l) => l.subject.id != "" || l.isEmpty).length));
 
-    final int minIndex = int.tryParse(everyLesson.first.lessonIndex) ?? 0;
-    final int maxIndex =
-        int.tryParse(everyLesson.last.lessonIndex) ?? maxLessonCount;
-
     const prefixw = 40;
     const padding = prefixw + 6 * 2;
     final colw = (MediaQuery.of(context).size.width - padding) / days.length;
 
     return Scaffold(
-      appBar: buildAppBar(),
+      appBar: AppBar(
+        surfaceTintColor: Theme.of(context).scaffoldBackgroundColor,
+        leading: BackButton(color: AppColors.of(context).text),
+        shadowColor: Colors.transparent,
+      ),
       body: ListView.builder(
         physics: const BouncingScrollPhysics(),
         padding: const EdgeInsets.symmetric(horizontal: 6.0, vertical: 24.0),
-        itemCount: maxIndex + 1,
+        itemCount: maxLessonCount + 1,
         itemBuilder: (context, index) {
           List<Widget> columns = [];
-
           for (int dayIndex = -1; dayIndex < days.length; dayIndex++) {
-            final dayOffset = dayIndex == -1
-                ? 0
-                : (int.tryParse(days[dayIndex].first.lessonIndex) ?? 0) -
-                    minIndex;
-            final lessonIndex = index - 1;
-
             if (dayIndex == -1) {
-              if (lessonIndex >= 0) {
+              if (index >= 1) {
                 columns.add(SizedBox(
                   width: prefixw.toDouble(),
                   height: 40.0,
                   child: Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 8.0),
                     child: Text(
-                      "${minIndex + lessonIndex}.",
+                      (index).toString()+".",
                       style: TextStyle(
                           fontWeight: FontWeight.bold,
                           color: Theme.of(context).colorScheme.secondary),
@@ -101,104 +93,112 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
                 .toList();
 
             if (lessons.isEmpty) continue;
-            if (lessonIndex >= lessons.length) continue;
 
-            if (dayIndex >= days.length ||
+            final dayOffset = int.tryParse(lessons.first.lessonIndex) ?? 0;
-                (lessonIndex + dayOffset) >= lessons.length) {
+
-              columns.add(SizedBox(width: colw));
+            if (index == 0 && dayIndex >= 0) {
+              columns.add(
+                SizedBox(
+                  width: colw,
+                  height: 40.0,
+                  child: Text(
+                    DateFormat("EEEE", I18n.of(context).locale.languageCode)
+                        .format(lessons.first.date)
+                        .capital(),
+                    style: const TextStyle(
+                      fontSize: 24.0,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                ),
+              );
               continue;
             }
 
-            if (lessonIndex == -1 && dayIndex >= 0) {
+            final lessonIndex = index - dayOffset;
-              columns.add(SizedBox(
+
-                width: colw,
+            if (lessonIndex < 0 || lessonIndex >= lessons.length) {
-                height: 40.0,
+              columns.add(SizedBox(width: colw));
-                child: Text(
-                  DateFormat("EEEE", I18n.of(context).locale.languageCode)
-                      .format(lessons.first.date)
-                      .capital(),
-                  style: const TextStyle(
-                      fontSize: 24.0, fontWeight: FontWeight.bold),
-                ),
-              ));
               continue;
             }
 
             if (lessons[lessonIndex].isEmpty) {
-              columns.add(SizedBox(
+              columns.add(
-                width: colw,
+                SizedBox(
-                child: Row(
+                  width: colw,
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                  child: Row(
-                  children: [
+                    crossAxisAlignment: CrossAxisAlignment.start,
-                    Icon(FeatherIcons.slash,
-                        size: 18.0,
-                        color: AppColors.of(context).text.withOpacity(.3)),
-                    const SizedBox(width: 8.0),
-                    Text(
-                      "Lyukas óra",
-                      style: TextStyle(
-                          color: AppColors.of(context).text.withOpacity(.3)),
-                    ),
-                  ],
-                ),
-              ));
-              continue;
-            }
-
-            if (dayOffset > 0 && lessonIndex < dayOffset) {
-              columns.add(SizedBox(width: colw));
-              continue;
-            }
-
-            columns.add(SizedBox(
-              width: colw,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
                     children: [
                       Icon(
-                        SubjectIcon.resolveVariant(
+                        FeatherIcons.slash,
-                            context: context,
-                            subject: lessons[lessonIndex - dayOffset].subject),
                         size: 18.0,
-                        color: AppColors.of(context).text.withOpacity(.7),
+                        color: AppColors.of(context).text.withOpacity(.3),
                       ),
                       const SizedBox(width: 8.0),
-                      Expanded(
+                      Text(
-                        child: Text(
+                        "Lyukas óra",
-                          lessons[lessonIndex - dayOffset].subject.renamedTo ??
+                        style: TextStyle(
-                              lessons[lessonIndex - dayOffset]
+                          color: AppColors.of(context).text.withOpacity(.3),
-                                  .subject
+                        ),
-                                  .name
+                      ),
-                                  .capital(),
+                    ],
-                          maxLines: 1,
+                  ),
-                          style: TextStyle(
+                ),
-                              fontStyle: lessons[lessonIndex - dayOffset]
+              );
+              continue;
+            }
+
+            columns.add(
+              SizedBox(
+                width: colw,
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Icon(
+                          SubjectIcon.resolveVariant(
+                            context: context,
+                            subject: lessons[lessonIndex].subject,
+                          ),
+                          size: 18.0,
+                          color: AppColors.of(context).text.withOpacity(.7),
+                        ),
+                        const SizedBox(width: 8.0),
+                        Expanded(
+                          child: Text(
+                            lessons[lessonIndex].subject.renamedTo ??
+                                lessons[lessonIndex].subject.name.capital(),
+                            maxLines: 1,
+                            style: TextStyle(
+                              fontStyle: lessons[lessonIndex]
                                       .subject
                                       .isRenamed
                                   ? FontStyle.italic
-                                  : null),
+                                  : null,
-                          overflow: TextOverflow.clip,
+                            ),
-                          softWrap: false,
+                            overflow: TextOverflow.clip,
+                            softWrap: false,
+                          ),
+                        ),
+                        const SizedBox(width: 15),
+                      ],
+                    ),
+                    Padding(
+                      padding: const EdgeInsets.only(left: 26.0),
+                      child: Text(
+                        lessons[lessonIndex].room,
+                        style: TextStyle(
+                          color: AppColors.of(context).text.withOpacity(.5),
+                          overflow: TextOverflow.ellipsis,
                         ),
                       ),
-                      const SizedBox(width: 15),
-                    ],
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(left: 26.0),
-                    child: Text(
-                      lessons[lessonIndex - dayOffset].room,
-                      style: TextStyle(
-                          color: AppColors.of(context).text.withOpacity(.5),
-                          overflow: TextOverflow.ellipsis),
                     ),
-                  ),
+                  ],
-                ],
+                ),
               ),
-            ));
+            );
           }
 
           return Row(
@@ -209,14 +209,4 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
       ),
     );
   }
-
-  AppBar buildAppBar() {
-    return AppBar(
-      backgroundColor: Colors.transparent,
-      automaticallyImplyLeading: false,
-      actions: const [
-        BackButton(),
-      ],
-    );
-  }
 }