hgeryy2004/firka
1
0
Fork 0
forked from firka/firka
Code Pull Requests Activity

fix: use proper font size

Browse Source
This commit is contained in:
4831c0
2025-09-17 13:32:46 +02:00
parent 3d41113c0f
commit 352f9f223b
20 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
firka/lib/helpers/ui/common_bottom_sheets.dart
View File

@@ -129,12 +129,12 @@ Future<void> showLessonBottomSheet(
),
Text(
lesson.teacher ?? 'N/A',
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary),
),
Text(
'${lesson.start.format(data.l10n, FormatMode.hmm)} - ${lesson.end.format(data.l10n, FormatMode.hmm)}',
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary),
),
],
@@ -225,7 +225,7 @@ Future<void> showGradeBottomSheet(
MediaQuery.of(context).size.width / 1.45,
child: Text(
grade.mode!.description!,
style: appStyle.fonts.B_14R.apply(
style: appStyle.fonts.B_16R.apply(
color: appStyle.colors.textSecondary),
),
)
@@ -265,17 +265,17 @@ Future<void> showGradeBottomSheet(
children: [
Text(
"${data.l10n.tt_added}${grade.creationDate}",
style: appStyle.fonts.B_14R.apply(
style: appStyle.fonts.B_16R.apply(
color: appStyle.colors.textPrimary),
),
Text(
"${data.l10n.grade_teacherName}${grade.teacher}",
style: appStyle.fonts.B_14R.apply(
style: appStyle.fonts.B_16R.apply(
color: appStyle.colors.textPrimary),
),
Text(
"${data.l10n.grade_strValue}${grade.strValue}",
style: appStyle.fonts.B_14R.apply(
style: appStyle.fonts.B_16R.apply(
color: appStyle.colors.textPrimary),
)
])
@@ -349,7 +349,7 @@ Future<void> showAnnouncementBottomSheet(
Text(
info.date.format(data.l10n, FormatMode.yyyymmdd),
textAlign: TextAlign.center,
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textSecondary),
),
],
@@ -390,7 +390,7 @@ Future<void> showAnnouncementBottomSheet(
width: MediaQuery.of(context).size.width / 1.4,
child: Text(
info.author,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textPrimary),
),
)

2
firka/lib/ui/phone/pages/extras/extras.dart
View File

@@ -125,7 +125,7 @@ void showExtrasBottomSheet(BuildContext context, AppInitialization data) {
GestureDetector(
child: Text(
"v${data.packageInfo.version} ${isBeta ? "beta" : ""}",
style: appStyle.fonts.B_14R.apply(
style: appStyle.fonts.B_16R.apply(
color: appStyle.colors.textTertiary)),
onTap: () async {
if (isDebug()) return;

2
firka/lib/ui/phone/pages/extras/main_error.dart
View File

@@ -34,7 +34,7 @@ void showErrorBottomSheet(BuildContext context, String err) {
child: Center(
child: Text(
err,
style: appStyle.fonts.B_14R,
style: appStyle.fonts.B_16R,
),
),
),

6
firka/lib/ui/phone/pages/extras/main_wear_pair.dart
View File

@@ -72,7 +72,7 @@ void showWearBottomSheet(
padding: const EdgeInsets.symmetric(horizontal: 6),
child: Text(
data.l10n.pairing_description,
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary),
textAlign: TextAlign.center,
),
@@ -87,7 +87,7 @@ void showWearBottomSheet(
center: [
Text(
data.l10n.pair,
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textSecondary),
)
],
@@ -120,7 +120,7 @@ void showWearBottomSheet(
center: [
Text(
data.l10n.cancel,
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textSecondary),
)
],

2
firka/lib/ui/phone/pages/home/home_grades.dart
View File

@@ -276,7 +276,7 @@ class _HomeGradesScreen extends FirkaState<HomeGradesScreen> {
lesson.type.name != TimetableConsts.event)
.length
.toString(),
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textPrimary),
),
],

6
firka/lib/ui/phone/pages/home/home_grades_subject.dart
View File

@@ -103,7 +103,7 @@ class _HomeGradesSubjectScreen extends FirkaState<HomeGradesSubjectScreen> {
SizedBox(
width: MediaQuery.of(context).size.width / 1.45,
child: Text(grade.topic ?? grade.type.description!,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textPrimary)),
),
grade.mode?.description != null
@@ -111,7 +111,7 @@ class _HomeGradesSubjectScreen extends FirkaState<HomeGradesSubjectScreen> {
width: MediaQuery.of(context).size.width / 1.45,
child: Text(
grade.mode!.description!,
style: appStyle.fonts.B_14R.apply(
style: appStyle.fonts.B_16R.apply(
color: appStyle.colors.textSecondary),
),
)
@@ -174,7 +174,7 @@ class _HomeGradesSubjectScreen extends FirkaState<HomeGradesSubjectScreen> {
// name isn't stored in the subject, so we need
// to get *a* grade, and then get the teacher's
// name from there :3
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary),
)
],

8
firka/lib/ui/phone/pages/home/home_main.dart
View File

@@ -199,12 +199,12 @@ class _HomeMainScreen extends FirkaState<HomeMainScreen> {
),
SizedBox(width: 6),
Text(test.theme,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textSecondary))
],
right: [
Text(test.method.description ?? "N/A",
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textTertiary))
],
);
@@ -246,7 +246,7 @@ class _HomeMainScreen extends FirkaState<HomeMainScreen> {
SizedBox(
width: MediaQuery.of(context).size.width / 1.45,
child: Text(grade.topic ?? grade.type.description!,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textPrimary)),
),
grade.mode?.description != null
@@ -254,7 +254,7 @@ class _HomeMainScreen extends FirkaState<HomeMainScreen> {
width: MediaQuery.of(context).size.width / 1.45,
child: Text(
grade.mode!.description!,
style: appStyle.fonts.B_14R.apply(
style: appStyle.fonts.B_16R.apply(
color: appStyle.colors.textSecondary),
),
)

4
firka/lib/ui/phone/pages/home/home_timetable.dart
View File

@@ -532,7 +532,7 @@ class _HomeTimetableScreen extends FirkaState<HomeTimetableScreen>
Text(
now!.format(
widget.data.l10n, FormatMode.yyyymmddwedd),
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary)),
SizedBox(width: 4),
Text("•",
@@ -543,7 +543,7 @@ class _HomeTimetableScreen extends FirkaState<HomeTimetableScreen>
now!.isAWeek()
? widget.data.l10n.a_week
: widget.data.l10n.b_week,
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary)),
],
),

6
firka/lib/ui/phone/pages/home/home_timetable_mo.dart
View File

@@ -149,7 +149,7 @@ class _HomeTimetableMonthlyScreen
)),
SizedBox(height: 4),
Text(d.format(widget.data.l10n, FormatMode.d),
style: appStyle.fonts.B_14R.apply(
style: appStyle.fonts.B_16R.apply(
color: (d.weekday == DateTime.saturday ||
d.weekday == DateTime.sunday)
? appStyle.colors.errorText
@@ -294,7 +294,7 @@ class _HomeTimetableMonthlyScreen
),
SizedBox(height: 4),
Text(d.format(widget.data.l10n, FormatMode.d),
style: appStyle.fonts.B_14R.apply(
style: appStyle.fonts.B_16R.apply(
color: (d.weekday == DateTime.saturday ||
d.weekday == DateTime.sunday) &&
lessonsToday.isEmpty
@@ -422,7 +422,7 @@ class _HomeTimetableMonthlyScreen
now!
.format(widget.data.l10n, FormatMode.yyyymmmm)
.toLowerCase(),
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary)),
GestureDetector(
child: FirkaIconWidget(

4
firka/lib/ui/phone/screens/home/beta_screen.dart
View File

@@ -75,7 +75,7 @@ class _BetaScreenState extends FirkaState<BetaScreen> {
child: FirkaButton(
text: widget.data.l10n.cancel,
bgColor: appStyle.colors.buttonSecondaryFill,
fontStyle: appStyle.fonts.B_14R
fontStyle: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimaryLight),
icon: Icon(Icons.close,
color: appStyle.colors.textPrimaryLight),
@@ -92,7 +92,7 @@ class _BetaScreenState extends FirkaState<BetaScreen> {
bgColor: counter == 0
? appStyle.colors.accent
: appStyle.colors.secondary,
fontStyle: appStyle.fonts.B_14R
fontStyle: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimaryLight),
icon: Icon(Icons.check,
color: appStyle.colors.textPrimaryLight),

6
firka/lib/ui/phone/screens/home/home_screen.dart
View File

@@ -120,7 +120,7 @@ class _HomeScreenState extends FirkaState<HomeScreen> {
SizedBox(width: 4),
Text(
widget.data.l10n.reauth,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.copyWith(color: appStyle.colors.warningText),
)
],
@@ -211,7 +211,7 @@ class _HomeScreenState extends FirkaState<HomeScreen> {
children: [
Text(
widget.data.l10n.api_error,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.copyWith(color: appStyle.colors.errorText),
),
SizedBox(width: 8),
@@ -370,7 +370,7 @@ class _HomeScreenState extends FirkaState<HomeScreen> {
SizedBox(width: 16),
Text(
widget.data.l10n.refreshing,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.copyWith(color: appStyle.colors.textPrimary),
)
],

2
firka/lib/ui/phone/screens/login/login_screen.dart
View File

@@ -201,7 +201,7 @@ class _LoginScreenState extends FirkaState<LoginScreen> {
const SizedBox(height: 8),
Text(
slides[index]['subtitle']! as String,
style: appStyle.fonts.B_14R.copyWith(
style: appStyle.fonts.B_16R.copyWith(
color: appStyle.colors.textPrimary),
softWrap: true,
overflow: TextOverflow.visible,

14
firka/lib/ui/phone/screens/settings/settings_screen.dart
View File

@@ -137,7 +137,7 @@ class _SettingsScreenState extends FirkaState<SettingsScreen> {
}
cardWidgets.add(Text(item.title,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textPrimary)));
widgets.add(GestureDetector(
@@ -174,7 +174,7 @@ class _SettingsScreenState extends FirkaState<SettingsScreen> {
.apply(color: appStyle.colors.textPrimary))
], right: [
Text(v == "0.0" ? "0" : v,
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary))
]),
onTap: () async {
@@ -415,7 +415,7 @@ class _SettingsScreenState extends FirkaState<SettingsScreen> {
if (group == widget.data.l10n.s_ci_icon_g6) {
pWidgets.add(Text(widget.data.l10n.s_ci_icon_g6_desc,
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textSecondary)));
}
@@ -462,7 +462,7 @@ class _SettingsScreenState extends FirkaState<SettingsScreen> {
child: FirkaButton(
text: widget.data.l10n.cancel,
bgColor: appStyle.colors.buttonSecondaryFill,
fontStyle: appStyle.fonts.B_14R
fontStyle: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textSecondary)),
onTap: () {
Navigator.pop(context);
@@ -472,7 +472,7 @@ class _SettingsScreenState extends FirkaState<SettingsScreen> {
child: FirkaButton(
text: widget.data.l10n.save,
bgColor: appStyle.colors.accent,
fontStyle: appStyle.fonts.B_14R
fontStyle: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textSecondaryLight)),
onTap: () async {
if (settingAppIcon) return;
@@ -736,7 +736,7 @@ void showSetDoubleSheet(BuildContext context, SettingsDouble setting,
Center(
child: Text(
setting.title,
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary),
)),
Padding(
@@ -771,7 +771,7 @@ void showSetDoubleSheet(BuildContext context, SettingsDouble setting,
}),
),
Text(setting.toRoundedString(),
style: appStyle.fonts.B_14R.apply(
style: appStyle.fonts.B_16R.apply(
color: appStyle.colors.textPrimary))
],
),

2
firka/lib/ui/phone/widgets/bottom_tt_icon.dart
View File

@@ -36,7 +36,7 @@ class BottomTimeTableNavIconWidget extends StatelessWidget {
.apply(color: appStyle.colors.textPrimary)),
Text(
date.format(l10n, FormatMode.dd),
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textSecondary),
)
],

2
firka/lib/ui/phone/widgets/home_main_welcome.dart
View File

@@ -104,7 +104,7 @@ class WelcomeWidget extends StatelessWidget {
.copyWith(color: appStyle.colors.textPrimary)),
const SizedBox(height: 2.0),
Text(getSubtitle(dayCycle),
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.copyWith(color: appStyle.colors.textSecondary)),
],
);

4
firka/lib/ui/phone/widgets/info_board_item.dart
View File

@@ -48,13 +48,13 @@ class InfoBoardItemWidget extends StatelessWidget {
width: MediaQuery.of(context).size.width / 1.4,
child: Text(
item.title,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textPrimary),
),
),
Text(
item.author,
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textSecondary),
)
],

24
firka/lib/ui/phone/widgets/lesson.dart
View File

@@ -147,7 +147,7 @@ class LessonWidget extends StatelessWidget {
: lesson.start
.toLocal()
.format(data.l10n, FormatMode.hmm),
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary)),
placeholderMode == true
? SizedBox()
@@ -192,12 +192,12 @@ class LessonWidget extends StatelessWidget {
),
SizedBox(width: 6),
Text(test!.theme,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textSecondary))
],
right: [
Text(test!.method.description ?? "N/A",
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textTertiary))
],
));
@@ -227,13 +227,13 @@ class LessonWidget extends StatelessWidget {
shadow: false,
left: [
Text(data.l10n.breakTxt,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textSecondary))
],
right: [
Text(
"$preBreak ${preBreak == 1 ? data.l10n.starting_min : data.l10n.starting_min_plural}",
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textTertiary))
],
));
@@ -285,7 +285,7 @@ class LessonWidget extends StatelessWidget {
isDismissed
? data.l10n.class_dismissed
: "${emptyClass.start.toLocal().format(data.l10n, FormatMode.hmm)} - ${emptyClass.end.toLocal().format(data.l10n, FormatMode.hmm)}",
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary))
],
));
@@ -300,13 +300,13 @@ class LessonWidget extends StatelessWidget {
shadow: false,
left: [
Text(data.l10n.breakTxt,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textSecondary))
],
right: [
Text(
"$postBreak ${postBreak == 1 ? data.l10n.starting_min : data.l10n.starting_min_plural}",
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textTertiary))
],
));
@@ -321,13 +321,13 @@ class LessonWidget extends StatelessWidget {
shadow: false,
left: [
Text(data.l10n.breakTxt,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textSecondary))
],
right: [
Text(
"$breakMins ${breakMins == 1 ? data.l10n.starting_min : data.l10n.starting_min_plural}",
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textTertiary))
],
));
@@ -342,13 +342,13 @@ class LessonWidget extends StatelessWidget {
shadow: false,
left: [
Text(data.l10n.breakTxt,
style: appStyle.fonts.B_14SB
style: appStyle.fonts.B_16SB
.apply(color: appStyle.colors.textSecondary))
],
right: [
Text(
"$breakMins ${breakMins == 1 ? data.l10n.starting_min : data.l10n.starting_min_plural}",
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textTertiary))
],
));

14
firka/lib/ui/phone/widgets/lesson_big.dart
View File

@@ -62,12 +62,12 @@ class LessonBigWidget extends StatelessWidget {
children: [
Row(children: [
Text('-',
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary))
]),
Row(children: [
Text('-',
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary))
])
],
@@ -125,7 +125,7 @@ class LessonBigWidget extends StatelessWidget {
children: [
Row(children: [
Text('-',
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary))
]),
Row(children: [
@@ -133,7 +133,7 @@ class LessonBigWidget extends StatelessWidget {
nextLesson!.start
.toLocal()
.format(l10n, FormatMode.hmm),
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary))
])
],
@@ -241,7 +241,7 @@ class LessonBigWidget extends StatelessWidget {
Row(
children: [
Text(lesson!.start.toLocal().format(l10n, FormatMode.hmm),
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary)),
Card(
shadowColor: Colors.transparent,
@@ -328,7 +328,7 @@ class LessonBigWidget extends StatelessWidget {
prevLesson!.end
.toLocal()
.format(l10n, FormatMode.hmm),
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary)),
],
),
@@ -338,7 +338,7 @@ class LessonBigWidget extends StatelessWidget {
nextLesson!.start
.toLocal()
.format(l10n, FormatMode.hmm),
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary)),
],
)

2
firka/lib/ui/phone/widgets/lesson_small.dart
View File

@@ -58,7 +58,7 @@ class LessonSmallWidget extends StatelessWidget {
),
Text(
"${lesson.start.toLocal().format(l10n, FormatMode.hmm)} - ${lesson.end.toLocal().format(l10n, FormatMode.hmm)}",
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary)),
],
)

2
firka/lib/ui/phone/widgets/tt_day.dart
View File

@@ -46,7 +46,7 @@ class TimeTableDayWidget extends StatelessWidget {
var event = events[i];
ttBody.add(FirkaCard(left: [
Text(event.name,
style: appStyle.fonts.B_14R
style: appStyle.fonts.B_16R
.apply(color: appStyle.colors.textPrimary))
]));
}