Preserve State of SegmentedButton in Calendar (#286)

Author: jakobkoerber

ios/Podfile.lock

@@ -20,15 +20,15 @@ PODS:
     - Firebase/RemoteConfig (= 11.2.0)
     - firebase_core
     - Flutter
-  - FirebaseABTesting (11.3.0):
+  - FirebaseABTesting (11.4.0):
     - FirebaseCore (~> 11.0)
   - FirebaseCore (11.2.0):
     - FirebaseCoreInternal (~> 11.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreExtension (11.3.0):
+  - FirebaseCoreExtension (11.4.1):
     - FirebaseCore (~> 11.0)
-  - FirebaseCoreInternal (11.3.0):
+  - FirebaseCoreInternal (11.4.0):
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
   - FirebaseCrashlytics (11.2.0):
     - FirebaseCore (~> 11.0)
@@ -39,7 +39,7 @@ PODS:
     - GoogleUtilities/Environment (~> 8.0)
     - nanopb (~> 3.30910.0)
     - PromisesObjC (~> 2.4)
-  - FirebaseInstallations (11.3.0):
+  - FirebaseInstallations (11.4.0):
     - FirebaseCore (~> 11.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
@@ -52,7 +52,7 @@ PODS:
     - FirebaseSharedSwift (~> 11.0)
     - GoogleUtilities/Environment (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
-  - FirebaseRemoteConfigInterop (11.3.0)
+  - FirebaseRemoteConfigInterop (11.4.0)
   - FirebaseSessions (11.3.0):
     - FirebaseCore (~> 11.0)
     - FirebaseCoreExtension (~> 11.0)
@@ -62,7 +62,7 @@ PODS:
     - GoogleUtilities/UserDefaults (~> 8.0)
     - nanopb (~> 3.30910.0)
     - PromisesSwift (~> 2.1)
-  - FirebaseSharedSwift (11.3.0)
+  - FirebaseSharedSwift (11.4.0)
   - Flutter (1.0.0)
   - flutter_native_splash (0.0.1):
     - Flutter
@@ -233,21 +233,21 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/video_player_avfoundation/darwin"
 
 SPEC CHECKSUMS:
-  device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
+  device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
   Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c
   firebase_core: 2bedc3136ec7c7b8561c6123ed0239387b53f2af
   firebase_crashlytics: 37d104d457b51760b48504a93a12b3bf70995d77
   firebase_remote_config: d522653d828836503715498f1662901a6efcd809
-  FirebaseABTesting: c4559fcd2eba9f6bdaf0599e2c37ded01c343e4c
+  FirebaseABTesting: aef1719704fade00b200827e7973f352efc4caee
   FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da
-  FirebaseCoreExtension: 30bb063476ef66cd46925243d64ad8b2c8ac3264
-  FirebaseCoreInternal: ac26d09a70c730e497936430af4e60fb0c68ec4e
+  FirebaseCoreExtension: f1bc67a4702931a7caa097d8e4ac0a1b0d16720e
+  FirebaseCoreInternal: 5c2b016f06a96fbf20d9b443459f80427a827d7b
   FirebaseCrashlytics: cfc69af5b53565dc6a5e563788809b5778ac4eac
-  FirebaseInstallations: 58cf94dabf1e2bb2fa87725a9be5c2249171cda0
+  FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
   FirebaseRemoteConfig: fca0b2d017fc1de52b28a4e5bcf2007c1a840457
-  FirebaseRemoteConfigInterop: c3a5c31b3c22079f41ba1dc645df889d9ce38cb9
+  FirebaseRemoteConfigInterop: e76f46ffa4d6a65e273d4dfebb6a79e588cec136
   FirebaseSessions: 655ff17f3cc1a635cbdc2d69b953878001f9e25b
-  FirebaseSharedSwift: d39c2ad64a11a8d936ce25a42b00df47078bb59c
+  FirebaseSharedSwift: 505dae2d05969dbf6d43749a642bb1bf230f0252
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
   flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
@@ -260,7 +260,7 @@ SPEC CHECKSUMS:
   home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
   map_launcher: 5fde49ac9a52672bf99da746599f507b4490d7b5
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47

lib/base/enums/user_preference.dart

@@ -8,7 +8,8 @@ enum UserPreference {
   browser(bool),
   failedGrades(bool),
   weekends(bool),
-  hiddenCalendarEntries(bool);
+  hiddenCalendarEntries(bool),
+  calendarTab(int);
 
   final Type type;
 

lib/base/routing/router_service.dart

@@ -1,6 +1,6 @@
 import 'package:campus_flutter/base/routing/routes.dart';
 import 'package:campus_flutter/onboardingComponent/viewModels/onboarding_viewmodel.dart';
-import 'package:campus_flutter/settingsComponent/viewModels/user_preferences_viewmodel.dart';
+import 'package:campus_flutter/settingsComponent/viewModels/settings_viewmodel.dart';
 import 'package:campus_flutter/studentCardComponent/viewModel/student_card_viewmodel.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -17,7 +17,7 @@ class RouterService {
   Future<String> routingCallback(GoRouterState state) async {
     if (!_isInitialized) {
       if (await ref.read(onboardingViewModel).checkLogin() == true) {
-        await ref.read(userPreferencesViewModel).loadPreferences();
+        await ref.read(settingsViewModel).loadPreferences();
         await ref.read(studentCardViewModel).fetch(false);
         _isInitialized = true;
         FlutterNativeSplash.remove();

lib/settingsComponent/service/user_preferences_service.dart renamed to lib/base/services/user_preferences_service.dart

@@ -1,9 +1,11 @@
 import 'dart:convert';
 
+import 'package:campus_flutter/base/enums/user_preference.dart';
 import 'package:campus_flutter/calendarComponent/model/calendar_event.dart';
 import 'package:campus_flutter/calendarComponent/services/calendar_preference_service.dart';
 import 'package:campus_flutter/calendarComponent/services/calendar_service.dart';
 import 'package:campus_flutter/main.dart';
+import 'package:campus_flutter/base/services/user_preferences_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:home_widget/home_widget.dart';
@@ -153,6 +155,20 @@ class CalendarViewModel {
     updateHomeWidget(events.value ?? []);
   }
 
+  int getTabPreference() {
+    return (getIt<UserPreferencesService>().load(
+          UserPreference.calendarTab,
+        ) as int?) ??
+        0;
+  }
+
+  void saveTabPreference(int currentTab) {
+    getIt<UserPreferencesService>().save(
+      UserPreference.calendarTab,
+      currentTab,
+    );
+  }
+
   void resetPreferences() {
     _resetEventColors();
     _resetVisibility();

lib/calendarComponent/viewModels/calendar_viewmodel.dart

@@ -41,7 +41,7 @@ class _CalendarsViewState extends ConsumerState<CalendarsView>
     ref
         .read(selectedDate.notifier)
         .addListener((state) => _selectedDateListener(state));
-    _selectedCalendarTab = 0;
+    _selectedCalendarTab = ref.read(calendarViewModel).getTabPreference();
     super.initState();
   }
 
@@ -98,9 +98,14 @@ class _CalendarsViewState extends ConsumerState<CalendarsView>
                         selected: {
                           _selectedCalendarTab,
                         },
-                        onSelectionChanged: (newSelection) => setState(() {
-                          _selectedCalendarTab = newSelection.first;
-                        }),
+                        onSelectionChanged: (newSelection) {
+                          setState(() {
+                            _selectedCalendarTab = newSelection.first;
+                          });
+                          ref.read(calendarViewModel).saveTabPreference(
+                                _selectedCalendarTab,
+                              );
+                        },
                       ),
                     ),
                   ],

lib/calendarComponent/views/calendars_view.dart

@@ -11,7 +11,7 @@ import 'package:campus_flutter/homeComponent/model/mvv_response.dart';
 import 'package:campus_flutter/homeComponent/model/station.dart';
 import 'package:campus_flutter/homeComponent/service/departures_service.dart';
 import 'package:campus_flutter/main.dart';
-import 'package:campus_flutter/settingsComponent/service/user_preferences_service.dart';
+import 'package:campus_flutter/base/services/user_preferences_service.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:geolocator/geolocator.dart';

lib/homeComponent/viewmodel/departures_viewmodel.dart

@@ -6,7 +6,7 @@ import 'package:campus_flutter/homeComponent/view/departure/departures_widget_vi
 import 'package:campus_flutter/main.dart';
 import 'package:campus_flutter/placesComponent/views/homeWidget/cafeteria_widget_view.dart';
 import 'package:campus_flutter/placesComponent/views/homeWidget/study_room_widget_view.dart';
-import 'package:campus_flutter/settingsComponent/service/user_preferences_service.dart';
+import 'package:campus_flutter/base/services/user_preferences_service.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

lib/homeComponent/viewmodel/home_viewmodel.dart

@@ -16,7 +16,7 @@ import 'package:campus_flutter/calendarComponent/services/calendar_view_service.
 import 'package:campus_flutter/onboardingComponent/services/onboarding_service.dart';
 import 'package:campus_flutter/navigation_service.dart';
 import 'package:campus_flutter/placesComponent/services/map_theme_service.dart';
-import 'package:campus_flutter/settingsComponent/service/user_preferences_service.dart';
+import 'package:campus_flutter/base/services/user_preferences_service.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:easy_logger/easy_logger.dart';
 import 'package:firebase_remote_config/firebase_remote_config.dart';

lib/main.dart

@@ -12,8 +12,8 @@ import 'package:campus_flutter/onboardingComponent/services/onboarding_service.d
 import 'package:campus_flutter/main.dart';
 import 'package:campus_flutter/personComponent/viewModel/person_details_viewmodel.dart';
 import 'package:campus_flutter/personComponent/viewModel/profile_viewmodel.dart';
-import 'package:campus_flutter/settingsComponent/service/user_preferences_service.dart';
-import 'package:campus_flutter/settingsComponent/viewModels/user_preferences_viewmodel.dart';
+import 'package:campus_flutter/base/services/user_preferences_service.dart';
+import 'package:campus_flutter/settingsComponent/viewModels/settings_viewmodel.dart';
 import 'package:campus_flutter/studentCardComponent/viewModel/student_card_viewmodel.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -147,7 +147,7 @@ class OnboardingViewModel {
   Future resetPreferences(WidgetRef ref) async {
     getIt<UserPreferencesService>().resetAll();
     getIt<CalendarPreferenceService>().resetPreferences();
-    ref.read(userPreferencesViewModel).loadPreferences();
+    ref.read(settingsViewModel).loadPreferences();
     ref.read(calendarViewModel).resetPreferences();
   }
 

lib/onboardingComponent/viewModels/onboarding_viewmodel.dart

@@ -9,7 +9,7 @@ import 'package:campus_flutter/placesComponent/model/cafeterias/dish.dart';
 import 'package:campus_flutter/placesComponent/model/cafeterias/mensa_menu.dart';
 import 'package:campus_flutter/placesComponent/services/cafeterias_service.dart';
 import 'package:campus_flutter/placesComponent/services/mealplan_service.dart';
-import 'package:campus_flutter/settingsComponent/service/user_preferences_service.dart';
+import 'package:campus_flutter/base/services/user_preferences_service.dart';
 import 'package:collection/collection.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';

lib/placesComponent/viewModels/cafeterias_viewmodel.dart

@@ -7,7 +7,7 @@ import 'package:campus_flutter/placesComponent/model/studyRooms/study_room.dart'
 import 'package:campus_flutter/placesComponent/model/studyRooms/study_room_data.dart';
 import 'package:campus_flutter/placesComponent/model/studyRooms/study_room_group.dart';
 import 'package:campus_flutter/placesComponent/services/study_rooms_service.dart';
-import 'package:campus_flutter/settingsComponent/service/user_preferences_service.dart';
+import 'package:campus_flutter/base/services/user_preferences_service.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:collection/collection.dart';

lib/placesComponent/viewModels/study_rooms_viewmodel.dart

@@ -3,19 +3,19 @@ import 'package:campus_flutter/base/enums/user_preference.dart';
 import 'package:campus_flutter/base/extensions/context.dart';
 import 'package:campus_flutter/base/util/icon_text.dart';
 import 'package:campus_flutter/main.dart';
-import 'package:campus_flutter/settingsComponent/service/user_preferences_service.dart';
+import 'package:campus_flutter/base/services/user_preferences_service.dart';
 import 'package:campus_flutter/settingsComponent/views/settings_view.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-final userPreferencesViewModel = Provider(
-  (ref) => UserPreferencesViewModel(ref),
+final settingsViewModel = Provider(
+  (ref) => SettingsViewModel(ref),
 );
 
-class UserPreferencesViewModel {
+class SettingsViewModel {
   final Ref ref;
 
-  UserPreferencesViewModel(this.ref);
+  SettingsViewModel(this.ref);
 
   Future<void> loadPreferences() async {
     return Future(() async {

lib/settingsComponent/viewModels/user_preferences_viewmodel.dart renamed to lib/settingsComponent/viewModels/settings_viewmodel.dart

@@ -4,7 +4,7 @@ import 'package:campus_flutter/base/util/seperated_list.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';
-import 'package:campus_flutter/settingsComponent/viewModels/user_preferences_viewmodel.dart';
+import 'package:campus_flutter/settingsComponent/viewModels/settings_viewmodel.dart';
 import 'package:campus_flutter/settingsComponent/views/settings_view.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -39,14 +39,14 @@ class AppearanceSettingsView extends ConsumerWidget {
       trailing: DropdownButton(
         onChanged: (Appearance? newAppearance) {
           if (newAppearance != null) {
-            ref.read(userPreferencesViewModel).savePreference(
+            ref.read(settingsViewModel).savePreference(
                   UserPreference.theme,
                   newAppearance,
                 );
           }
         },
         value: ref.watch(appearance),
-        items: UserPreferencesViewModel.getAppearanceEntries(context),
+        items: SettingsViewModel.getAppearanceEntries(context),
       ),
     );
   }
@@ -61,7 +61,7 @@ class AppearanceSettingsView extends ConsumerWidget {
       trailing: Switch(
         value: ref.watch(useWebView),
         onChanged: (showWebView) {
-          ref.read(userPreferencesViewModel).savePreference(
+          ref.read(settingsViewModel).savePreference(
                 UserPreference.browser,
                 showWebView,
               );
@@ -81,7 +81,7 @@ class AppearanceSettingsView extends ConsumerWidget {
       trailing: Switch(
         value: ref.watch(hideFailedGrades),
         onChanged: (value) {
-          ref.read(userPreferencesViewModel).savePreference(
+          ref.read(settingsViewModel).savePreference(
                 UserPreference.failedGrades,
                 value,
               );

lib/settingsComponent/views/appearance_settings_view.dart

@@ -3,7 +3,7 @@ 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/viewModels/settings_viewmodel.dart';
 import 'package:campus_flutter/settingsComponent/views/settings_view.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -38,7 +38,7 @@ class CalendarSettingsView extends ConsumerWidget {
       trailing: Switch(
         value: ref.watch(showWeekends),
         onChanged: (value) {
-          ref.read(userPreferencesViewModel).savePreference(
+          ref.read(settingsViewModel).savePreference(
                 UserPreference.weekends,
                 value,
               );
@@ -59,7 +59,7 @@ class CalendarSettingsView extends ConsumerWidget {
       trailing: Switch(
         value: ref.watch(showHiddenCalendarEntries),
         onChanged: (value) {
-          ref.read(userPreferencesViewModel).savePreference(
+          ref.read(settingsViewModel).savePreference(
                 UserPreference.hiddenCalendarEntries,
                 value,
               );