Merge pull request #65 from sleddev/dev

timetable italics + instituteCode search + theme preview background color
This commit is contained in:
Márton Kiss 2023-09-28 21:17:50 +02:00 committed by GitHub
commit dca01d0ed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions

View File

@ -17,6 +17,8 @@ List<School> searchSchools(List<School> all, String pattern) {
}); });
if (contains == pattern.split(" ").length) results.add(item); 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)); results.sort((a, b) => a.name.compareTo(b.name));

View File

@ -337,7 +337,8 @@ class _PremiumCustomAccentColorSettingState
0.75 0.75
], ],
colors: [ colors: [
Theme.of(context).colorScheme.background, settings.customBackgroundColor
?? Theme.of(context).colorScheme.background,
isBackgroundDifferent isBackgroundDifferent
? HSVColor.fromColor(Theme.of(context) ? HSVColor.fromColor(Theme.of(context)
.colorScheme .colorScheme

View File

@ -1,4 +1,5 @@
import 'package:filcnaplo/helpers/subject.dart'; import 'package:filcnaplo/helpers/subject.dart';
import 'package:filcnaplo/models/settings.dart';
import 'package:filcnaplo/theme/colors/colors.dart'; import 'package:filcnaplo/theme/colors/colors.dart';
import 'package:filcnaplo_kreta_api/controllers/timetable_controller.dart'; import 'package:filcnaplo_kreta_api/controllers/timetable_controller.dart';
import 'package:filcnaplo_mobile_ui/common/empty.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 'dart:math' as math;
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:i18n_extension/i18n_widget.dart'; import 'package:i18n_extension/i18n_widget.dart';
import 'package:provider/provider.dart';
class PremiumFSTimetable extends StatefulWidget { class PremiumFSTimetable extends StatefulWidget {
const PremiumFSTimetable({Key? key, required this.controller}) const PremiumFSTimetable({Key? key, required this.controller})
@ -21,6 +23,8 @@ class PremiumFSTimetable extends StatefulWidget {
} }
class _PremiumFSTimetableState extends State<PremiumFSTimetable> { class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
late SettingsProvider settings;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -37,6 +41,8 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
settings = Provider.of<SettingsProvider>(context);
if (widget.controller.days == null || widget.controller.days!.isEmpty) { if (widget.controller.days == null || widget.controller.days!.isEmpty) {
return const Center(child: Empty()); return const Center(child: Empty());
} }
@ -174,7 +180,7 @@ class _PremiumFSTimetableState extends State<PremiumFSTimetable> {
style: TextStyle( style: TextStyle(
fontStyle: lessons[lessonIndex] fontStyle: lessons[lessonIndex]
.subject .subject
.isRenamed .isRenamed && settings.renamedSubjectsItalics
? FontStyle.italic ? FontStyle.italic
: null, : null,
), ),