link the animation to the actual refresh process

Author: FarisZR

lib/schedule/ui/viewmodels/weekly_schedule_view_model.dart

@@ -328,6 +328,7 @@ class WeeklyScheduleViewModel extends BaseViewModel {
       currentDateStart,
       currentDateEnd,
       force: true,
+      awaitRefresh: true,
     );
   }
 
@@ -361,6 +362,7 @@ class WeeklyScheduleViewModel extends BaseViewModel {
     DateTime end, {
     bool force = false,
     bool applyToVisibleState = true,
+    bool awaitRefresh = false,
   }) async {
     if (_isDisposed) return;
 
@@ -417,6 +419,7 @@ class WeeklyScheduleViewModel extends BaseViewModel {
         end,
         visibleUpdateRequestId: visibleUpdateRequestId,
         applyToVisibleState: applyToVisibleState,
+        awaitRefresh: awaitRefresh,
         origin: applyToVisibleState
             ? ScheduleRefreshOrigin.userBrowsing
             : ScheduleRefreshOrigin.foregroundMaintenance,
@@ -434,6 +437,7 @@ class WeeklyScheduleViewModel extends BaseViewModel {
     DateTime end, {
     int? visibleUpdateRequestId,
     bool applyToVisibleState = true,
+    bool awaitRefresh = false,
     ScheduleRefreshOrigin origin = ScheduleRefreshOrigin.userBrowsing,
   }) async {
     final task = PerformanceTelemetry.instance.startTask(
@@ -470,27 +474,32 @@ class WeeklyScheduleViewModel extends BaseViewModel {
     }
 
     final nowValue = now;
-    final shouldForceFetch = cachedSchedule.entries.isEmpty &&
-        scheduleSourceProvider.currentScheduleSource.canQuery();
+    final shouldForceFetch = awaitRefresh ||
+        (cachedSchedule.entries.isEmpty &&
+            scheduleSourceProvider.currentScheduleSource.canQuery());
     final isStale = shouldForceFetch || _isWindowStale(start, end, nowValue);
 
     if (!isStale) {
       unawaited(task.finish());
       return false;
     }
 
-    unawaited(
-      _refreshScheduleInBackground(
-        start,
-        end,
-        cancellationToken,
-        task,
-        visibleUpdateRequestId: visibleUpdateRequestId,
-        applyToVisibleState: applyToVisibleState,
-        origin: origin,
-      ),
+    final refreshFuture = _refreshScheduleInBackground(
+      start,
+      end,
+      cancellationToken,
+      task,
+      visibleUpdateRequestId: visibleUpdateRequestId,
+      applyToVisibleState: applyToVisibleState,
+      origin: origin,
     );
 
+    if (awaitRefresh) {
+      await refreshFuture;
+    } else {
+      unawaited(refreshFuture);
+    }
+
     return true;
   }
 

test/schedule/ui/viewmodels/weekly_schedule_background_refresh_test.dart

@@ -183,6 +183,66 @@ void main() {
 
     expect(viewModel.isUpdating, isFalse);
   });
+
+  test(
+    'refreshVisibleWeek awaits network refresh before completing',
+    () async {
+      final provider = _BlockingScheduleProvider();
+      final sourceProvider = _FakeScheduleSourceProvider();
+      final viewModel = WeeklyScheduleViewModel(provider, sourceProvider);
+
+      final weekStart = DateTime(2026, 2, 9);
+      final weekEnd = DateTime(2026, 2, 16);
+
+      viewModel.currentDateStart = weekStart;
+      viewModel.currentDateEnd = weekEnd;
+
+      var refreshCompleted = false;
+      final refreshFuture = viewModel.refreshVisibleWeek().then((_) {
+        refreshCompleted = true;
+      });
+
+      // Let microtasks run but the blocking provider hasn't completed yet.
+      await Future<void>.delayed(const Duration(milliseconds: 50));
+      expect(refreshCompleted, isFalse,
+          reason: 'refreshVisibleWeek should not complete until network '
+              'request finishes');
+
+      // Now complete the network request.
+      provider.complete(
+        ScheduleQueryResult(Schedule(), const []),
+      );
+      await refreshFuture;
+      expect(refreshCompleted, isTrue);
+    },
+  );
+
+  test(
+    'refreshVisibleWeek forces fetch even when cache is fresh',
+    () async {
+      final entries = <ScheduleEntry>[
+        _entry(DateTime(2026, 2, 9), 'Mon'),
+      ];
+      final provider = _CountingScheduleProvider(entries);
+      final sourceProvider = _FakeScheduleSourceProvider();
+      final viewModel = WeeklyScheduleViewModel(provider, sourceProvider);
+
+      final weekStart = DateTime(2026, 2, 9);
+      final weekEnd = DateTime(2026, 2, 16);
+
+      // Initial load populates cache and marks window as fresh.
+      await viewModel.updateSchedule(weekStart, weekEnd, force: true);
+      expect(provider.updatedScheduleRequests, 1);
+
+      viewModel.currentDateStart = weekStart;
+      viewModel.currentDateEnd = weekEnd;
+
+      // Pull-to-refresh should fetch again even though cache is fresh.
+      await viewModel.refreshVisibleWeek();
+      expect(provider.updatedScheduleRequests, 2,
+          reason: 'pull-to-refresh must bypass staleness gate');
+    },
+  );
 }
 
 ScheduleEntry _entry(DateTime start, String suffix) {