refactor: decouple calendar screens from route-driven reload

apps/lib/features/calendar/ui/screens/calendar_dayweek_screen.dart

@@ -8,7 +8,7 @@ import '../../../../core/di/injection.dart';
 import '../../../../core/theme/design_tokens.dart';
 import '../../../../shared/widgets/app_pressable.dart';
 import '../../data/models/schedule_item_model.dart';
-import '../../data/services/calendar_service.dart';
+import '../../data/services/calendar_repository.dart';
 import '../calendar_state_manager.dart';
 import '../calendar_time_utils.dart';
 import '../utils/event_color_resolver.dart';
@@ -67,25 +67,18 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen>
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _scrollToSelectedDate();
-      _setupRouteListener();
     });
   }
 
-  void _setupRouteListener() {
-    final router = GoRouter.of(context);
-    router.routerDelegate.addListener(_onRouteChange);
-  }
-
-  void _onRouteChange() {
-    _loadEvents();
-  }
-
   void _updateMonthDates() {
     _monthDates = monthDatesFor(_selectedDate);
   }
 
-  Future<void> _loadEvents() async {
-    final events = await sl<CalendarService>().getEventsForDay(_selectedDate);
+  Future<void> _loadEvents({bool forceRefresh = false}) async {
+    final events = await sl<CalendarRepository>().getDayEvents(
+      _selectedDate,
+      forceRefresh: forceRefresh,
+    );
     if (!mounted) {
       return;
     }
@@ -96,9 +89,6 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen>
 
   @override
   void dispose() {
-    try {
-      GoRouter.of(context).routerDelegate.removeListener(_onRouteChange);
-    } catch (_) {}
     WidgetsBinding.instance.removeObserver(this);
     _dayStripController.dispose();
     super.dispose();
@@ -107,7 +97,7 @@ class _CalendarDayWeekScreenState extends State<CalendarDayWeekScreen>
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     if (state == AppLifecycleState.resumed) {
-      _loadEvents();
+      _loadEvents(forceRefresh: true);
     }
   }
 

apps/lib/features/calendar/ui/screens/calendar_month_screen.dart

@@ -12,7 +12,7 @@ import '../calendar_time_utils.dart';
 import '../utils/event_color_resolver.dart';
 import '../widgets/bottom_dock.dart';
 import '../../data/models/schedule_item_model.dart';
-import '../../data/services/calendar_service.dart';
+import '../../data/services/calendar_repository.dart';
 
 class CalendarMonthScreen extends StatefulWidget {
   final bool resetToToday;
@@ -44,32 +44,13 @@ class _CalendarMonthScreenState extends State<CalendarMonthScreen>
     _selectedDate = savedDate;
     _currentMonth = DateTime(savedDate.year, savedDate.month, 1);
     _loadMonthEvents();
-
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      _setupRouteListener();
-    });
   }
 
-  void _setupRouteListener() {
-    final router = GoRouter.of(context);
-    router.routerDelegate.addListener(_onRouteChange);
-  }
-
-  void _onRouteChange() {
-    _loadMonthEvents();
-  }
-
-  Future<void> _loadMonthEvents() async {
-    final start = DateTime(_currentMonth.year, _currentMonth.month, 1);
-    final end = DateTime(
-      _currentMonth.year,
-      _currentMonth.month + 1,
-      0,
-      23,
-      59,
-      59,
+  Future<void> _loadMonthEvents({bool forceRefresh = false}) async {
+    final events = await sl<CalendarRepository>().getMonthEvents(
+      _currentMonth,
+      forceRefresh: forceRefresh,
     );
-    final events = await sl<CalendarService>().getEventsForRange(start, end);
     if (!mounted) {
       return;
     }
@@ -83,9 +64,6 @@ class _CalendarMonthScreenState extends State<CalendarMonthScreen>
 
   @override
   void dispose() {
-    try {
-      GoRouter.of(context).routerDelegate.removeListener(_onRouteChange);
-    } catch (_) {}
     WidgetsBinding.instance.removeObserver(this);
     super.dispose();
   }
@@ -93,7 +71,7 @@ class _CalendarMonthScreenState extends State<CalendarMonthScreen>
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     if (state == AppLifecycleState.resumed) {
-      _loadMonthEvents();
+      _loadMonthEvents(forceRefresh: true);
     }
   }