Improve course units loading behavior

NIAEFEUP · Sep 28, 2023 · 9d145da · 9d145da
1 parent 172d85e
commit 9d145da
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 49 deletions.
diff --git a/uni/lib/view/common_widgets/pages_layouts/general/general.dart b/uni/lib/view/common_widgets/pages_layouts/general/general.dart
@@ -3,7 +3,9 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:logger/logger.dart';
 import 'package:provider/provider.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:uni/model/providers/startup/profile_provider.dart';
 import 'package:uni/model/providers/startup/session_provider.dart';
 import 'package:uni/utils/drawer_items.dart';
@@ -13,15 +15,51 @@ import 'package:uni/view/profile/profile.dart';
 /// Page with a hamburger menu and the user profile picture
 abstract class GeneralPageViewState<T extends StatefulWidget> extends State<T> {
   final double borderMargin = 18;
+  bool _loadedOnce = false;
+  bool _loading = true;
 
   Future<void> onRefresh(BuildContext context);
 
   Future<void> onLoad(BuildContext context) async {}
 
   @override
   Widget build(BuildContext context) {
-    WidgetsBinding.instance.addPostFrameCallback((_) => onLoad(context));
-    return getScaffold(context, getBody(context));
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      if (_loadedOnce) {
+        return;
+      }
+      _loadedOnce = true;
+      setState(() {
+        _loading = true;
+      });
+
+      try {
+        await onLoad(context);
+      } catch (e, stackTrace) {
+        Logger().e('Failed to load page info: $e\n$stackTrace');
+        await Sentry.captureException(e, stackTrace: stackTrace);
+      }
+
+      setState(() {
+        _loading = false;
+      });
+    });
+
+    return getScaffold(
+      context,
+      _loading
+          ? const Flex(
+              direction: Axis.vertical,
+              children: [
+                Expanded(
+                  child: Center(
+                    child: CircularProgressIndicator(),
+                  ),
+                )
+              ],
+            )
+          : getBody(context),
+    );
   }
 
   Widget getBody(BuildContext context) {

diff --git a/uni/lib/view/course_unit_info/course_unit_info.dart b/uni/lib/view/course_unit_info/course_unit_info.dart
@@ -6,13 +6,12 @@ import 'package:uni/model/providers/lazy/course_units_info_provider.dart';
 import 'package:uni/model/providers/startup/session_provider.dart';
 import 'package:uni/view/common_widgets/page_title.dart';
 import 'package:uni/view/common_widgets/pages_layouts/secondary/secondary.dart';
-import 'package:uni/view/common_widgets/request_dependent_widget_builder.dart';
 import 'package:uni/view/course_unit_info/widgets/course_unit_classes.dart';
 import 'package:uni/view/course_unit_info/widgets/course_unit_sheet.dart';
-import 'package:uni/view/lazy_consumer.dart';
 
 class CourseUnitDetailPageView extends StatefulWidget {
   const CourseUnitDetailPageView(this.courseUnit, {super.key});
+
   final CourseUnit courseUnit;
 
   @override
@@ -91,50 +90,36 @@ class CourseUnitDetailPageViewState
   }
 
   Widget _courseUnitSheetView(BuildContext context) {
-    return LazyConsumer<CourseUnitsInfoProvider>(
-      builder: (context, courseUnitsInfoProvider) {
-        return RequestDependentWidgetBuilder(
-          onNullContent: Center(
-            child: Text(
-              S.of(context).no_info,
-              textAlign: TextAlign.center,
-            ),
-          ),
-          status: courseUnitsInfoProvider.status,
-          builder: () => CourseUnitSheetView(
-            courseUnitsInfoProvider.courseUnitsSheets[widget.courseUnit]!,
-          ),
-          hasContentPredicate:
-              courseUnitsInfoProvider.courseUnitsSheets[widget.courseUnit] !=
-                      null &&
-                  courseUnitsInfoProvider.courseUnitsSheets[widget.courseUnit]!
-                      .sections.isNotEmpty,
-        );
-      },
-    );
+    final sheet = context
+        .read<CourseUnitsInfoProvider>()
+        .courseUnitsSheets[widget.courseUnit];
+
+    if (sheet == null || sheet.sections.isEmpty) {
+      return Center(
+        child: Text(
+          S.of(context).no_info,
+          textAlign: TextAlign.center,
+        ),
+      );
+    }
+
+    return CourseUnitSheetView(sheet);
   }
 
   Widget _courseUnitClassesView(BuildContext context) {
-    return LazyConsumer<CourseUnitsInfoProvider>(
-      builder: (context, courseUnitsInfoProvider) {
-        return RequestDependentWidgetBuilder(
-          onNullContent: Center(
-            child: Text(
-              S.of(context).no_class,
-              textAlign: TextAlign.center,
-            ),
-          ),
-          status: courseUnitsInfoProvider.status,
-          builder: () => CourseUnitClassesView(
-            courseUnitsInfoProvider.courseUnitsClasses[widget.courseUnit]!,
-          ),
-          hasContentPredicate:
-              courseUnitsInfoProvider.courseUnitsClasses[widget.courseUnit] !=
-                      null &&
-                  courseUnitsInfoProvider
-                      .courseUnitsClasses[widget.courseUnit]!.isNotEmpty,
-        );
-      },
-    );
+    final classes = context
+        .read<CourseUnitsInfoProvider>()
+        .courseUnitsClasses[widget.courseUnit];
+
+    if (classes == null || classes.isEmpty) {
+      return Center(
+        child: Text(
+          S.of(context).no_class,
+          textAlign: TextAlign.center,
+        ),
+      );
+    }
+
+    return CourseUnitClassesView(classes);
   }
 }
diff --git a/uni/lib/view/lazy_consumer.dart b/uni/lib/view/lazy_consumer.dart
@@ -69,9 +69,7 @@ class LazyConsumer<T extends StateProviderNotifier> extends StatelessWidget {
 
       // Finally, complete provider initialization
       if (context.mounted) {
-        // This will fail if the session initialization failed.
-        // That is the expected behavior.
-        await sessionFuture!.then((_) async {
+        await sessionFuture?.then((_) async {
           await provider!.ensureInitializedFromRemote(context);
         });
       }