Fixes around non standard format of grade symbols (#63)

* Fix grade symbol to color converter for non standard grade formats

* Fix new grade notification for non standard grade formats

Author: OvrBtn

StudentUsos/Converters/GradeSymbolToColorConverter.cs

@@ -1,4 +1,5 @@
-using System.Globalization;
+using StudentUsos.Features.Grades.Helpers;
+using System.Globalization;
 
 namespace StudentUsos.Converters;
 
@@ -14,6 +15,7 @@ public object Convert(object? value, Type targetType, object? parameter, Culture
         {
             if (value == null) return Colors.Transparent;
             string grade = value.ToString()!;
+            grade = GradesHelper.GetGradeFromNonStandardGradeString(grade);
             if (grade.Length == 0) return Colors.Transparent;
             if (grade[0] == '5' || grade == "ZAL") return GradeColor1;
             if (grade[0] == '4') return GradeColor2;

StudentUsos/Features/Grades/Helpers/GradesHelper.cs

@@ -79,15 +79,31 @@ public static List<FinalGrade> UngroupGrades(IEnumerable<FinalGradeGroup> finalG
 
     /// <summary>
     /// Some univeristies have weird formats for grade symbols e.g. instead of doing only "4.5"
-    /// they will add something more e.g. "4.5 (bd)" which won't work with normal float.TryParse.
+    /// they will add something more e.g. "4.5 (bd)", this returns only the "4.5" part.
     /// </summary>
     /// <param name="gradeString">Non standard grade string</param>
     /// <returns></returns>
-    static bool TryParseGradeFromNonStandardGradeString(string gradeString, out float parsed)
+    public static string GetGradeFromNonStandardGradeString(string gradeString)
     {
         gradeString = gradeString.Replace(',', '.');
         var match = Regex.Match(gradeString, @"[-+]?\d*\.?\d+");
-        if (match.Success && float.TryParse(match.Value, NumberStyles.Float, CultureInfo.InvariantCulture, out float parseResult))
+        if (match.Success)
+        {
+            return match.Value;
+        }
+        return string.Empty;
+    }
+
+    /// <summary>
+    /// Some univeristies have weird formats for grade symbols e.g. instead of doing only "4.5"
+    /// they will add something more e.g. "4.5 (bd)" which won't work with normal float.TryParse.
+    /// </summary>
+    /// <param name="gradeString">Non standard grade string</param>
+    /// <returns></returns>
+    public static bool TryParseGradeFromNonStandardGradeString(string gradeString, out float parsed)
+    {
+        string extracted = GetGradeFromNonStandardGradeString(gradeString);
+        if (float.TryParse(extracted, NumberStyles.Float, CultureInfo.InvariantCulture, out float parseResult))
         {
             parsed = parseResult;
             return true;

StudentUsos/Platforms/Android/CustomNotificationBuilder.cs

@@ -2,6 +2,7 @@
 using Plugin.FirebasePushNotifications;
 using Plugin.FirebasePushNotifications.Platforms;
 using StudentUsos.Features.Authorization.Services;
+using StudentUsos.Features.Grades.Helpers;
 using StudentUsos.Resources.LocalizedStrings;
 using StudentUsos.Services.ServerConnection;
 using System.Globalization;
@@ -114,7 +115,9 @@ async Task HandleNewGradeNotificationAsync(IDictionary<string, object> data)
                 }
             }
             data["title"] = LocalizedStrings.PushNotifications_UsosNewGrade_InterpretedTitle;
-            data["large_icon"] = $"notification_new_grade_{deserialized.ValueSymbol.Replace(".", "").ToLowerInvariant()}";
+
+            string gradeNormalized = GradesHelper.GetGradeFromNonStandardGradeString(deserialized.ValueSymbol);
+            data["large_icon"] = $"notification_new_grade_{gradeNormalized.Replace(".", "").ToLowerInvariant()}";
         }
         catch (Exception ex) { data["body"] += ex.Message; }
     }