From 26071db35168a3d43e40fe6ece3d64edeebf851d Mon Sep 17 00:00:00 2001
From: ezyyeah <ezy@gmail.com>
Date: Mon, 23 Jan 2023 15:23:46 +0100
Subject: [PATCH] better rename func

---
 filcnaplo/lib/ui/widgets/grade/grade_tile.dart   | 4 ++--
 filcnaplo/lib/ui/widgets/lesson/lesson_tile.dart | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/filcnaplo/lib/ui/widgets/grade/grade_tile.dart b/filcnaplo/lib/ui/widgets/grade/grade_tile.dart
index d1ed7a0..0487505 100644
--- a/filcnaplo/lib/ui/widgets/grade/grade_tile.dart
+++ b/filcnaplo/lib/ui/widgets/grade/grade_tile.dart
@@ -23,7 +23,7 @@ class GradeTile extends StatelessWidget {
     String subtitle;
     EdgeInsets leadingPadding = EdgeInsets.zero;
     bool isSubjectView = SubjectGradesContainer.of(context) != null;
-    String subjectName = grade.subject.renamedTo != null ? grade.subject.renamedTo! : grade.subject.name.capital();
+    String subjectName = grade.subject.renamedTo ?? grade.subject.name.capital();
     String modeDescription = grade.mode.description.capital();
     String description = grade.description.capital();
 
@@ -112,7 +112,7 @@ class GradeTile extends StatelessWidget {
                   title,
                   maxLines: 2,
                   overflow: TextOverflow.ellipsis,
-                  style: TextStyle(fontWeight: FontWeight.w600, fontStyle: grade.subject.renamedTo != null ? FontStyle.italic : null),
+                  style: TextStyle(fontWeight: FontWeight.w600, fontStyle: grade.subject.isRenamed ? FontStyle.italic : null),
                 ),
           subtitle: subtitle != ""
               ? censored
diff --git a/filcnaplo/lib/ui/widgets/lesson/lesson_tile.dart b/filcnaplo/lib/ui/widgets/lesson/lesson_tile.dart
index 7639271..4a651e4 100644
--- a/filcnaplo/lib/ui/widgets/lesson/lesson_tile.dart
+++ b/filcnaplo/lib/ui/widgets/lesson/lesson_tile.dart
@@ -133,18 +133,14 @@ class LessonTile extends StatelessWidget {
                   contentPadding: const EdgeInsets.symmetric(horizontal: 4.0),
                   shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12.0)),
                   title: Text(
-                    !lesson.isEmpty
-                        ? lesson.subject.renamedTo != null
-                            ? 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),
-                        fontStyle: lesson.subject.renamedTo != null ? FontStyle.italic : null),
+                        fontStyle: lesson.subject.isRenamed ? FontStyle.italic : null),
                   ),
                   subtitle: description != ""
                       ? Text(