From 2b7e14381256455839d7593f0d4a711b6a5fa255 Mon Sep 17 00:00:00 2001 From: SledDev <90392654+sleddev@users.noreply.github.com> Date: Thu, 28 Sep 2023 19:12:56 +0200 Subject: [PATCH 1/3] fixed fullscreen timetable italics --- .../lib/ui/mobile/timetable/fs_timetable.dart | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/filcnaplo_premium/lib/ui/mobile/timetable/fs_timetable.dart b/filcnaplo_premium/lib/ui/mobile/timetable/fs_timetable.dart index a19f9ff..9d8aa6b 100644 --- a/filcnaplo_premium/lib/ui/mobile/timetable/fs_timetable.dart +++ b/filcnaplo_premium/lib/ui/mobile/timetable/fs_timetable.dart @@ -1,4 +1,5 @@ import 'package:filcnaplo/helpers/subject.dart'; +import 'package:filcnaplo/models/settings.dart'; import 'package:filcnaplo/theme/colors/colors.dart'; import 'package:filcnaplo_kreta_api/controllers/timetable_controller.dart'; import 'package:filcnaplo_mobile_ui/common/empty.dart'; @@ -9,6 +10,7 @@ import 'package:filcnaplo/utils/format.dart'; import 'dart:math' as math; import 'package:intl/intl.dart'; import 'package:i18n_extension/i18n_widget.dart'; +import 'package:provider/provider.dart'; class PremiumFSTimetable extends StatefulWidget { const PremiumFSTimetable({Key? key, required this.controller}) @@ -21,6 +23,8 @@ class PremiumFSTimetable extends StatefulWidget { } class _PremiumFSTimetableState extends State { + late SettingsProvider settings; + @override void initState() { super.initState(); @@ -37,6 +41,8 @@ class _PremiumFSTimetableState extends State { @override Widget build(BuildContext context) { + settings = Provider.of(context); + if (widget.controller.days == null || widget.controller.days!.isEmpty) { return const Center(child: Empty()); } @@ -174,7 +180,7 @@ class _PremiumFSTimetableState extends State { style: TextStyle( fontStyle: lessons[lessonIndex] .subject - .isRenamed + .isRenamed && settings.renamedSubjectsItalics ? FontStyle.italic : null, ), From 8451983163b00b56f7a1fbc57b64339c4fe2d2ab Mon Sep 17 00:00:00 2001 From: SledDev <90392654+sleddev@users.noreply.github.com> Date: Thu, 28 Sep 2023 19:41:43 +0200 Subject: [PATCH 2/3] find schools by instituteCode --- .../lib/screens/login/school_input/school_search.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/filcnaplo_mobile_ui/lib/screens/login/school_input/school_search.dart b/filcnaplo_mobile_ui/lib/screens/login/school_input/school_search.dart index 4cbfb30..bb82fb0 100755 --- a/filcnaplo_mobile_ui/lib/screens/login/school_input/school_search.dart +++ b/filcnaplo_mobile_ui/lib/screens/login/school_input/school_search.dart @@ -17,6 +17,8 @@ List searchSchools(List all, String pattern) { }); if (contains == pattern.split(" ").length) results.add(item); + + if (item.instituteCode.toLowerCase().specialChars().contains(pattern)) results.add(item); } results.sort((a, b) => a.name.compareTo(b.name)); From 493adaa5f25acaa4b6be0fe1e0afe0bd3ddf5c93 Mon Sep 17 00:00:00 2001 From: SledDev <90392654+sleddev@users.noreply.github.com> Date: Thu, 28 Sep 2023 20:15:09 +0200 Subject: [PATCH 3/3] fixed background color in theme preview --- filcnaplo_premium/lib/ui/mobile/settings/theme.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/filcnaplo_premium/lib/ui/mobile/settings/theme.dart b/filcnaplo_premium/lib/ui/mobile/settings/theme.dart index 1d2b3b1..c9ffb30 100644 --- a/filcnaplo_premium/lib/ui/mobile/settings/theme.dart +++ b/filcnaplo_premium/lib/ui/mobile/settings/theme.dart @@ -337,7 +337,8 @@ class _PremiumCustomAccentColorSettingState 0.75 ], colors: [ - Theme.of(context).colorScheme.background, + settings.customBackgroundColor + ?? Theme.of(context).colorScheme.background, isBackgroundDifferent ? HSVColor.fromColor(Theme.of(context) .colorScheme