diff --git a/filcnaplo_mobile_ui/lib/pages/timetable/timetable_page.dart b/filcnaplo_mobile_ui/lib/pages/timetable/timetable_page.dart index 3f27cb2..529e48a 100755 --- a/filcnaplo_mobile_ui/lib/pages/timetable/timetable_page.dart +++ b/filcnaplo_mobile_ui/lib/pages/timetable/timetable_page.dart @@ -66,9 +66,13 @@ class TimetablePageState extends State late UserProvider user; late TimetableProvider timetableProvider; late UpdateProvider updateProvider; + late SettingsProvider settingsProvider; + late String firstName; + late TimetableController _controller; late TabController _tabController; + late Widget empty; int _getDayIndex(DateTime date) { @@ -175,6 +179,7 @@ class TimetablePageState extends State user = Provider.of(context); timetableProvider = Provider.of(context); updateProvider = Provider.of(context); + settingsProvider = Provider.of(context); // First name List nameParts = user.displayName?.split(" ") ?? ["?"]; @@ -478,7 +483,8 @@ class TimetablePageState extends State children: [ if (before != null && (before.end.hour != 0 && - lesson.start.hour != 0)) + lesson.start.hour != 0) && + settingsProvider.showBreaks) Padding( padding: EdgeInsets.only( top: index == 0 diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart index 8c44a61..8a4e7ce 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.i18n.dart @@ -96,6 +96,7 @@ extension SettingsLocalization on String { "current_paint": "Current Paint", "rename_subjects": "Rename Subjects", "rename_teachers": "Rename Teachers", + "show_breaks": "Show Breaks", }, "hu_hu": { "personal_details": "Személyes információk", @@ -190,6 +191,7 @@ extension SettingsLocalization on String { "current_paint": "Jelenlegi téma", "rename_subjects": "Tantárgyak átnevezése", "rename_teachers": "Tanárok átnevezése", + "show_breaks": "Szünetek megjelenítése", }, "de_de": { "personal_details": "Persönliche Angaben", @@ -284,6 +286,7 @@ extension SettingsLocalization on String { "current_paint": "Aktuelles Thema", "rename_subjects": "Fächer umbenennen", "rename_teachers": "Lehrer umbenennen", + "show_breaks": "Pausen anzeigen", }, }; diff --git a/filcnaplo_mobile_ui/lib/screens/settings/submenu/general_screen.dart b/filcnaplo_mobile_ui/lib/screens/settings/submenu/general_screen.dart index 691dbf4..8fac14d 100644 --- a/filcnaplo_mobile_ui/lib/screens/settings/submenu/general_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/submenu/general_screen.dart @@ -285,6 +285,44 @@ class GeneralSettingsScreenState extends State { ), ], ), + SplittedPanel( + padding: const EdgeInsets.only(top: 9.0), + cardPadding: const EdgeInsets.all(4.0), + isSeparated: true, + children: [ + PanelButton( + padding: const EdgeInsets.only(left: 14.0, right: 6.0), + onPressed: () { + settingsProvider.update( + showBreaks: !settingsProvider.showBreaks); + setState(() {}); + }, + title: Text( + "show_breaks".i18n, + style: TextStyle( + color: AppColors.of(context).text.withOpacity( + settingsProvider.showBreaks ? .95 : .25), + ), + ), + leading: Icon( + FeatherIcons.eye, + size: 22.0, + color: AppColors.of(context) + .text + .withOpacity(settingsProvider.showBreaks ? .95 : .25), + ), + trailing: Switch( + onChanged: (v) => settingsProvider.update(showBreaks: v), + value: settingsProvider.showBreaks, + activeColor: Theme.of(context).colorScheme.secondary, + ), + borderRadius: const BorderRadius.vertical( + top: Radius.circular(12.0), + bottom: Radius.circular(12.0), + ), + ), + ], + ), ], ), ),