From 850800864dacad73afbd0cfd30c9915730186800 Mon Sep 17 00:00:00 2001 From: Armand <4831c0@proton.me> Date: Thu, 25 Sep 2025 21:47:23 +0200 Subject: [PATCH] adjust fonts --- .../lib/ui/phone/pages/home/home_grades.dart | 12 ++--- .../phone/pages/home/home_grades_subject.dart | 49 +++++++++---------- firka/lib/ui/phone/widgets/lesson.dart | 2 +- 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/firka/lib/ui/phone/pages/home/home_grades.dart b/firka/lib/ui/phone/pages/home/home_grades.dart index 940a56ac..2e9c6c5a 100644 --- a/firka/lib/ui/phone/pages/home/home_grades.dart +++ b/firka/lib/ui/phone/pages/home/home_grades.dart @@ -33,8 +33,8 @@ class HomeGradesScreen extends StatefulWidget { } String activeSubjectUid = ""; -String alkalmazottNev = ""; -String tantargyNev = ""; +String teacherName = ""; +String subjectName = ""; class _HomeGradesScreen extends FirkaState { ApiResponse>? grades; @@ -170,8 +170,8 @@ class _HomeGradesScreen extends FirkaState { child: GradeSmallCard(grades!.response!, subject), onTap: () { activeSubjectUid = subject.uid; - alkalmazottNev = subject.teacherName ?? ''; - tantargyNev = subject.name; + teacherName = subject.teacherName ?? ''; + subjectName = subject.name; widget.pageController(1); }, )); @@ -180,8 +180,8 @@ class _HomeGradesScreen extends FirkaState { child: GradeSmallCard(grades!.response!, subject), onTap: () { activeSubjectUid = subject.uid; - alkalmazottNev = subject.teacherName ?? ''; - tantargyNev = subject.name; + teacherName = subject.teacherName ?? ''; + subjectName = subject.name; widget.pageController(1); }, )); diff --git a/firka/lib/ui/phone/pages/home/home_grades_subject.dart b/firka/lib/ui/phone/pages/home/home_grades_subject.dart index 9449ef3f..d4bf9857 100644 --- a/firka/lib/ui/phone/pages/home/home_grades_subject.dart +++ b/firka/lib/ui/phone/pages/home/home_grades_subject.dart @@ -10,7 +10,6 @@ import '../../../../helpers/firka_state.dart'; import '../../../../helpers/update_notifier.dart'; import '../../../../main.dart'; import '../../../model/style.dart'; -import '../../../widget/delayed_spinner.dart'; class HomeGradesSubjectScreen extends StatefulWidget { final AppInitialization data; @@ -199,32 +198,32 @@ class _HomeGradesSubjectScreen extends FirkaState { return Column( mainAxisAlignment: MainAxisAlignment.start, children: [ - FirkaCard( - left: [ - Padding( - padding: EdgeInsets.only(left: 4), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - width: MediaQuery.of(context).size.width / 1.45, - child: Text( - tantargyNev, - style: appStyle.fonts.H_H2 - .apply(color: appStyle.colors.textPrimary), - ), - ), - Text( - alkalmazottNev, - style: appStyle.fonts.B_16R - .apply(color: appStyle.colors.textPrimary), - ) - ], + FirkaCard( + left: [ + Padding( + padding: EdgeInsets.only(left: 4), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + width: MediaQuery.of(context).size.width / 1.45, + child: Text( + subjectName, + style: appStyle.fonts.H_H2 + .apply(color: appStyle.colors.textPrimary), + ), ), - ) - ], - ), + Text( + teacherName, + style: appStyle.fonts.B_14R + .apply(color: appStyle.colors.textPrimary), + ) + ], + ), + ) ], + ), + ], ); } } diff --git a/firka/lib/ui/phone/widgets/lesson.dart b/firka/lib/ui/phone/widgets/lesson.dart index 21b839ea..d2132d7d 100644 --- a/firka/lib/ui/phone/widgets/lesson.dart +++ b/firka/lib/ui/phone/widgets/lesson.dart @@ -171,7 +171,7 @@ class LessonWidget extends StatelessWidget { elements.add(FirkaCard( left: [ Text(data.l10n.class_substitution, - style: appStyle.fonts.H_14px + style: appStyle.fonts.H_16px .apply(color: appStyle.colors.textPrimary)) ], right: [