From 5f0c82f54cf8508e97866bc4a2946162ce4e85bf Mon Sep 17 00:00:00 2001
From: Kima <kimavideos97@gmail.com>
Date: Thu, 8 Jun 2023 21:18:20 +0200
Subject: [PATCH] added grade value translations

---
 .../lib/providers/grade_provider.dart           |  4 +++-
 .../lib/providers/homework_provider.dart        | 17 ++++++++++++++++-
 .../screens/navigation/navigation_screen.dart   |  3 +--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/filcnaplo_kreta_api/lib/providers/grade_provider.dart b/filcnaplo_kreta_api/lib/providers/grade_provider.dart
index a6fbd4c..f15ef1c 100644
--- a/filcnaplo_kreta_api/lib/providers/grade_provider.dart
+++ b/filcnaplo_kreta_api/lib/providers/grade_provider.dart
@@ -93,7 +93,9 @@ class GradeProvider with ChangeNotifier {
           _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;
diff --git a/filcnaplo_kreta_api/lib/providers/homework_provider.dart b/filcnaplo_kreta_api/lib/providers/homework_provider.dart
index 5fd9981..34cde5a 100644
--- a/filcnaplo_kreta_api/lib/providers/homework_provider.dart
+++ b/filcnaplo_kreta_api/lib/providers/homework_provider.dart
@@ -39,10 +39,25 @@ class HomeworkProvider with ChangeNotifier {
               .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;
diff --git a/filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart b/filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart
index c7cec4a..a829763 100755
--- a/filcnaplo_mobile_ui/lib/screens/navigation/navigation_screen.dart
+++ b/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 =
-          WidgetsBinding.instance.window.platformBrightness;
+      Brightness? brightness = MediaQuery.of(context).platformBrightness;
       Provider.of<ThemeModeObserver>(context, listen: false).changeTheme(
           brightness == Brightness.light ? ThemeMode.light : ThemeMode.dark);
     }