From b84b3e39d9a02e7a1ad860f1e14d348180e3d56e Mon Sep 17 00:00:00 2001
From: Pearoo <sixtyny@gmail.com>
Date: Thu, 21 Mar 2024 00:19:49 +0100
Subject: [PATCH] Revert "Revert "Add new notification for surprise grades""

This reverts commit 61bc1f4d7297b1d7f4cc4ce1c37ead516c095760.
---
 refilc/lib/helpers/notification_helper.dart   | 24 +++++++++++++++----
 .../lib/helpers/notification_helper.i18n.dart |  3 ++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/refilc/lib/helpers/notification_helper.dart b/refilc/lib/helpers/notification_helper.dart
index 8daea82..562463e 100644
--- a/refilc/lib/helpers/notification_helper.dart
+++ b/refilc/lib/helpers/notification_helper.dart
@@ -134,11 +134,27 @@ class NotificationsHelper {
                   "title_grade".i18n,
                   "body_grade".i18n.fill(
                     [
-                      grade.value.value.toString(),
                       grade.subject.isRenamed &&
                               settingsProvider.renamedSubjectsEnabled
                           ? grade.subject.renamedTo!
-                          : grade.subject.name
+                          : grade.subject.name,
+                      grade.value.value.toString()
+                    ],
+                  ),
+                  notificationDetails,
+                  payload: "grades");
+            } else if (settingsProvider.gradeOpeningFun) { 
+              // if surprise grades are enabled, show a notification without the grade
+              await flutterLocalNotificationsPlugin.show(
+                  grade.id.hashCode,
+                  "title_grade".i18n,
+                  "body_grade_surprise".i18n.fill(
+                    [
+                      grade.subject.isRenamed &&
+                              settingsProvider.renamedSubjectsEnabled
+                          ? grade.subject.renamedTo!
+                          : grade.subject.name,
+                      grade.value.value.toString()
                     ],
                   ),
                   notificationDetails,
@@ -151,11 +167,11 @@ class NotificationsHelper {
                   "body_grade_multiuser".i18n.fill(
                     [
                       currentuserProvider.displayName!,
-                      grade.value.value.toString(),
                       grade.subject.isRenamed &&
                               settingsProvider.renamedSubjectsEnabled
                           ? grade.subject.renamedTo!
-                          : grade.subject.name
+                          : grade.subject.name,
+                      grade.value.value.toString()
                     ],
                   ),
                   notificationDetails,
diff --git a/refilc/lib/helpers/notification_helper.i18n.dart b/refilc/lib/helpers/notification_helper.i18n.dart
index f2d220b..a569290 100644
--- a/refilc/lib/helpers/notification_helper.i18n.dart
+++ b/refilc/lib/helpers/notification_helper.i18n.dart
@@ -8,6 +8,7 @@ extension Localization on String {
           "title_grade": "New grade",
           "body_grade": "%s: %s",
           "body_grade_multiuser": "(%s) %s: %s",
+          "body_grade_surprise": "Open the app to see your grade!",
           "title_absence": "Absence recorded",
           "body_absence": "An absence was recorded on %s for %s",
           "body_absence_multiuser": "An absence was recorded for %s on %s for the subject %s",
@@ -35,7 +36,7 @@ extension Localization on String {
           "title_grade": "Neue Note",
           "body_grade": "%s: %s",
           "body_grade_multiuser": "(%s) %s: %s",
-          "body_grade_surprise": "Öffnen Sie die App, um Ihre Note anzuzeigen",
+          "body_grade_surprise": "Öffnen Sie die App, um Ihre Note anzuzeigen!",
           "title_absence": "Abwesenheit aufgezeichnet",
           "body_absence": "Auf %s für %s wurde eine Abwesenheit aufgezeichnet",
           "body_absence_multiuser": "Für %s wurde am %s für das Thema Mathematik eine Abwesenheit aufgezeichnet",