devbeni/student-legacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed subject rename at homeworks

Browse Source
This commit is contained in:
Kima
2023-06-08 20:38:10 +02:00
parent 50e24bde17
commit 4e659308e5
6 changed files with 148 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
filcnaplo_mobile_ui/lib/common/widgets/homework/homework_tile.dart
View File

@@ -42,7 +42,7 @@ class HomeworkTile extends StatelessWidget {
padding: const EdgeInsets.only(top: 2.0),
child: Icon(
SubjectIcon.resolveVariant(
subjectName: homework.subjectName, context: context),
subjectName: homework.subject.name, context: context),
size: 28.0,
color: AppColors.of(context).text.withOpacity(.75),
),
@@ -62,7 +62,7 @@ class HomeworkTile extends StatelessWidget {
],
)
: Text(
homework.subjectName.capital(),
homework.subject.renamedTo ?? homework.subject.name.capital(),
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: const TextStyle(fontWeight: FontWeight.w600),

13
filcnaplo_mobile_ui/lib/common/widgets/homework/homework_view.dart
View File

@@ -40,11 +40,12 @@ class HomeworkView extends StatelessWidget {
// Header
ListTile(
leading: Icon(
SubjectIcon.resolveVariant(subjectName: homework.subjectName, context: context),
SubjectIcon.resolveVariant(
subjectName: homework.subject.name, context: context),
size: 36.0,
),
title: Text(
homework.subjectName.capital(),
homework.subject.renamedTo ?? homework.subject.name.capital(),
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(fontWeight: FontWeight.w600),
@@ -62,9 +63,13 @@ class HomeworkView extends StatelessWidget {
),
// Details
if (homework.deadline.year != 0) Detail(title: "deadline".i18n, description: homework.deadline.format(context)),
if (homework.deadline.year != 0)
Detail(
title: "deadline".i18n,
description: homework.deadline.format(context)),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 18.0, vertical: 6.0),
padding:
const EdgeInsets.symmetric(horizontal: 18.0, vertical: 6.0),
child: SelectableLinkify(
text: homework.content.escapeHtml(),
options: const LinkifyOptions(looseUrl: true, removeWww: true),