Restructure Settings

Author: jakobkoerber

lib/settingsComponent/views/appearance_settings_view.dart

@@ -1,8 +1,6 @@
 import 'package:campus_flutter/base/enums/appearance.dart';
 import 'package:campus_flutter/base/enums/user_preference.dart';
 import 'package:campus_flutter/base/util/seperated_list.dart';
-import 'package:campus_flutter/calendarComponent/viewModels/calendar_viewmodel.dart';
-import 'package:campus_flutter/calendarComponent/views/calendars_view.dart';
 import 'package:campus_flutter/studiesComponent/viewModel/grade_viewmodel.dart';
 import 'package:campus_flutter/homeComponent/view/widget/widget_frame_view.dart';
 import 'package:campus_flutter/main.dart';
@@ -11,7 +9,6 @@ import 'package:campus_flutter/settingsComponent/views/settings_view.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:syncfusion_flutter_calendar/calendar.dart';
 
 class AppearanceSettingsView extends ConsumerWidget {
   const AppearanceSettingsView({super.key});
@@ -26,8 +23,6 @@ class AppearanceSettingsView extends ConsumerWidget {
             _appearanceSelection(context, ref),
             _useWebView(context, ref),
             _hideFailedGrades(context, ref),
-            _showWeekends(context, ref),
-            _showHiddenCalendarEntries(context, ref),
           ],
         ),
       ),
@@ -95,45 +90,4 @@ class AppearanceSettingsView extends ConsumerWidget {
       ),
     );
   }
-
-  Widget _showWeekends(BuildContext context, WidgetRef ref) {
-    return ListTile(
-      dense: true,
-      title: Text(
-        context.tr("showWeekends"),
-        style: Theme.of(context).textTheme.bodyMedium,
-      ),
-      trailing: Switch(
-        value: ref.watch(showWeekends),
-        onChanged: (value) {
-          ref.read(userPreferencesViewModel).savePreference(
-                UserPreference.weekends,
-                value,
-              );
-          calendarsKey.currentState?.weekController.view =
-              value ? CalendarView.week : CalendarView.workWeek;
-        },
-      ),
-    );
-  }
-
-  Widget _showHiddenCalendarEntries(BuildContext context, WidgetRef ref) {
-    return ListTile(
-      dense: true,
-      title: Text(
-        context.tr("showHiddenCalendarEntries"),
-        style: Theme.of(context).textTheme.bodyMedium,
-      ),
-      trailing: Switch(
-        value: ref.watch(showHiddenCalendarEntries),
-        onChanged: (value) {
-          ref.read(userPreferencesViewModel).savePreference(
-                UserPreference.hiddenCalendarEntries,
-                value,
-              );
-          ref.read(calendarViewModel).fetch(false);
-        },
-      ),
-    );
-  }
 }

lib/settingsComponent/views/calendar_settings_view.dart

@@ -0,0 +1,71 @@
+import 'package:campus_flutter/base/enums/user_preference.dart';
+import 'package:campus_flutter/base/util/seperated_list.dart';
+import 'package:campus_flutter/calendarComponent/viewModels/calendar_viewmodel.dart';
+import 'package:campus_flutter/calendarComponent/views/calendars_view.dart';
+import 'package:campus_flutter/homeComponent/view/widget/widget_frame_view.dart';
+import 'package:campus_flutter/settingsComponent/viewModels/user_preferences_viewmodel.dart';
+import 'package:campus_flutter/settingsComponent/views/settings_view.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:syncfusion_flutter_calendar/calendar.dart';
+
+class CalendarSettingsView extends ConsumerWidget {
+  const CalendarSettingsView({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return WidgetFrameView(
+      title: context.tr("calendar"),
+      child: Card(
+        child: SeparatedList.widgets(
+          widgets: [
+            _showWeekends(context, ref),
+            _showHiddenCalendarEntries(context, ref),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _showWeekends(BuildContext context, WidgetRef ref) {
+    return ListTile(
+      dense: true,
+      title: Text(
+        context.tr("showWeekends"),
+        style: Theme.of(context).textTheme.bodyMedium,
+      ),
+      trailing: Switch(
+        value: ref.watch(showWeekends),
+        onChanged: (value) {
+          ref.read(userPreferencesViewModel).savePreference(
+                UserPreference.weekends,
+                value,
+              );
+          calendarsKey.currentState?.weekController.view =
+              value ? CalendarView.week : CalendarView.workWeek;
+        },
+      ),
+    );
+  }
+
+  Widget _showHiddenCalendarEntries(BuildContext context, WidgetRef ref) {
+    return ListTile(
+      dense: true,
+      title: Text(
+        context.tr("showHiddenCalendarEntries"),
+        style: Theme.of(context).textTheme.bodyMedium,
+      ),
+      trailing: Switch(
+        value: ref.watch(showHiddenCalendarEntries),
+        onChanged: (value) {
+          ref.read(userPreferencesViewModel).savePreference(
+                UserPreference.hiddenCalendarEntries,
+                value,
+              );
+          ref.read(calendarViewModel).fetch(false);
+        },
+      ),
+    );
+  }
+}

lib/settingsComponent/views/settings_view.dart

@@ -4,6 +4,7 @@ import 'package:campus_flutter/base/util/padded_divider.dart';
 import 'package:campus_flutter/homeComponent/view/widget/widget_frame_view.dart';
 import 'package:campus_flutter/onboardingComponent/viewModels/onboarding_viewmodel.dart';
 import 'package:campus_flutter/settingsComponent/views/appearance_settings_view.dart';
+import 'package:campus_flutter/settingsComponent/views/calendar_settings_view.dart';
 import 'package:campus_flutter/settingsComponent/views/contact_view.dart';
 import 'package:campus_flutter/settingsComponent/views/general_settings_view.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -30,6 +31,7 @@ class SettingsView extends ConsumerWidget {
               children: [
                 GeneralSettingsView(),
                 AppearanceSettingsView(),
+                CalendarSettingsView(),
               ],
             ),
           ),
@@ -49,6 +51,7 @@ class SettingsView extends ConsumerWidget {
         children: [
           const GeneralSettingsView(),
           const AppearanceSettingsView(),
+          const CalendarSettingsView(),
           const ContactView(),
           _resetButtons(context, ref),
           _versionNumberText(),