changed old subject type to gradesubject

filcnaplo_mobile_ui/lib/common/personality_card/personality_card.dart

@@ -35,12 +35,12 @@ class _PersonalityCardState extends State<PersonalityCard> {
   late SettingsProvider settings;
 
   late List<int> subjectAvgsList = [];
-  late Map<Subject, double> subjectAvgs = {};
+  late Map<GradeSubject, double> subjectAvgs = {};
   late double subjectAvg;
   late List<Grade> classWorkGrades;
   late Map<int, int> mostCommonGrade;
   late List<Absence> absences = [];
-  final Map<Subject, Lesson> _lessonCount = {};
+  final Map<GradeSubject, Lesson> _lessonCount = {};
   late int totalDelays;
   late int unexcusedAbsences;
 
@@ -48,14 +48,15 @@ class _PersonalityCardState extends State<PersonalityCard> {
 
   bool hold = false;
 
-  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();
+  List<Grade> getSubjectGrades(GradeSubject 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();
 
   @override
   void initState() {
@@ -89,13 +90,13 @@ class _PersonalityCardState extends State<PersonalityCard> {
   }
 
   void getGrades() {
-    List<Subject> subjects = gradeProvider.grades
+    List<GradeSubject> subjects = gradeProvider.grades
         .map((e) => e.subject)
         .toSet()
         .toList()
       ..sort((a, b) => a.name.compareTo(b.name));
 
-    for (Subject subject in subjects) {
+    for (GradeSubject subject in subjects) {
       List<Grade> subjectGrades = getSubjectGrades(subject);
 
       double avg = AverageHelper.averageEvals(subjectGrades);

filcnaplo_mobile_ui/lib/common/widgets/absence/absence_subject_tile.dart

@@ -8,10 +8,16 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 class AbsenceSubjectTile extends StatelessWidget {
-  const AbsenceSubjectTile(this.subject, {Key? key, this.percentage = 0.0, this.excused = 0, this.unexcused = 0, this.pending = 0, this.onTap})
+  const AbsenceSubjectTile(this.subject,
+      {Key? key,
+      this.percentage = 0.0,
+      this.excused = 0,
+      this.unexcused = 0,
+      this.pending = 0,
+      this.onTap})
       : super(key: key);
 
-  final Subject subject;
+  final GradeSubject subject;
   final void Function()? onTap;
   final double percentage;
 
@@ -31,12 +37,20 @@ class AbsenceSubjectTile extends StatelessWidget {
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8.0)),
         visualDensity: VisualDensity.compact,
         onTap: onTap,
-        leading: Icon(SubjectIcon.resolveVariant(subject: subject, context: context), size: 32.0),
+        leading: Icon(
+            SubjectIcon.resolveVariant(subject: subject, context: context),
+            size: 32.0),
         title: Text(
           subject.renamedTo ?? subject.name.capital(),
           maxLines: 2,
           overflow: TextOverflow.ellipsis,
-          style: TextStyle(fontWeight: FontWeight.w600, fontSize: 15.0, fontStyle: subject.isRenamed && settingsProvider.renamedSubjectsItalics ? FontStyle.italic : null),
+          style: TextStyle(
+              fontWeight: FontWeight.w600,
+              fontSize: 15.0,
+              fontStyle:
+                  subject.isRenamed && settingsProvider.renamedSubjectsItalics
+                      ? FontStyle.italic
+                      : null),
         ),
         subtitle: AbsenceDisplay(excused, unexcused, pending),
         trailing: Row(
@@ -47,7 +61,10 @@ class AbsenceSubjectTile extends StatelessWidget {
               Stack(
                 alignment: Alignment.centerRight,
                 children: [
-                  const Opacity(child: Text("100%", style: TextStyle(fontFamily: "monospace")), opacity: 0),
+                  const Opacity(
+                      child: Text("100%",
+                          style: TextStyle(fontFamily: "monospace")),
+                      opacity: 0),
                   Text(
                     percentage.round().toString() + "%",
                     style: TextStyle(

filcnaplo_mobile_ui/lib/common/widgets/grade/grade_subject_tile.dart

@@ -16,7 +16,7 @@ class GradeSubjectTile extends StatelessWidget {
       this.averageBefore = 0.0})
       : super(key: key);
 
-  final Subject subject;
+  final GradeSubject subject;
   final void Function()? onTap;
   final double average;
   final double groupAverage;
@@ -56,7 +56,10 @@ class GradeSubjectTile extends StatelessWidget {
               fontWeight: FontWeight.w600,
               fontSize: 14.0,
               color: textColor,
-              fontStyle: settingsProvider.renamedSubjectsItalics && subject.isRenamed ? FontStyle.italic : null),
+              fontStyle:
+                  settingsProvider.renamedSubjectsItalics && subject.isRenamed
+                      ? FontStyle.italic
+                      : null),
         ),
         trailing: Row(
           mainAxisSize: MainAxisSize.min,