Fix analyze

ApplETS · Oct 19, 2024 · bdc17d3 · bdc17d3
1 parent 32762ea
commit bdc17d3
Show file tree

Hide file tree

Showing 19 changed files with 111 additions and 131 deletions.
diff --git a/lib/features/app/error/outage/outage_view.dart b/lib/features/app/error/outage/outage_view.dart
@@ -2,15 +2,15 @@
 import 'package:flutter/material.dart';
 
 // Package imports:
-import 'package:notredame/features/app/error/outage/widgets/outage_image_section.dart';
-import 'package:notredame/features/app/error/outage/widgets/outage_social_section.dart';
-import 'package:notredame/features/app/error/outage/widgets/outage_text_section.dart';
 import 'package:stacked/stacked.dart';
 
 // Project imports:
-import 'package:notredame/utils/utils.dart';
 import 'package:notredame/features/app/error/outage/outage_viewmodel.dart';
+import 'package:notredame/features/app/error/outage/widgets/outage_image_section.dart';
+import 'package:notredame/features/app/error/outage/widgets/outage_social_section.dart';
+import 'package:notredame/features/app/error/outage/widgets/outage_text_section.dart';
 import 'package:notredame/utils/app_theme.dart';
+import 'package:notredame/utils/utils.dart';
 
 class OutageView extends StatelessWidget {
   @override

diff --git a/lib/features/app/error/outage/outage_viewmodel.dart b/lib/features/app/error/outage/outage_viewmodel.dart
@@ -1,6 +1,7 @@
-// Flutter imports:
+// Dart imports:
 import 'dart:async';
 
+// Flutter imports:
 import 'package:flutter/material.dart';
 
 // Package imports:

diff --git a/lib/features/app/error/outage/widgets/outage_text_section.dart b/lib/features/app/error/outage/widgets/outage_text_section.dart
@@ -1,4 +1,7 @@
+// Flutter imports:
 import 'package:flutter/material.dart';
+
+// Package imports:
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class OutageTextSection extends StatelessWidget {

diff --git a/lib/features/app/widgets/base_scaffold.dart b/lib/features/app/widgets/base_scaffold.dart
@@ -10,8 +10,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 // Project imports:
 import 'package:notredame/features/app/integration/networking_service.dart';
-import 'package:notredame/features/app/widgets/navigation_rail.dart';
 import 'package:notredame/features/app/widgets/bottom_bar.dart';
+import 'package:notredame/features/app/widgets/navigation_rail.dart';
 import 'package:notredame/utils/app_theme.dart';
 import 'package:notredame/utils/loading.dart';
 import 'package:notredame/utils/locator.dart';

diff --git a/lib/features/dashboard/dashboard_view.dart b/lib/features/dashboard/dashboard_view.dart
@@ -7,7 +7,6 @@ import 'package:auto_size_text/auto_size_text.dart';
 import 'package:feature_discovery_fork/feature_discovery.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:notredame/features/app/signets-api/models/course.dart';
 import 'package:skeletonizer/skeletonizer.dart';
 import 'package:stacked/stacked.dart';
 
@@ -18,6 +17,7 @@ import 'package:notredame/constants/urls.dart';
 import 'package:notredame/features/app/analytics/analytics_service.dart';
 import 'package:notredame/features/app/navigation/navigation_service.dart';
 import 'package:notredame/features/app/navigation/router_paths.dart';
+import 'package:notredame/features/app/signets-api/models/course.dart';
 import 'package:notredame/features/app/signets-api/models/course_activity.dart';
 import 'package:notredame/features/app/widgets/base_scaffold.dart';
 import 'package:notredame/features/app/widgets/dismissible_card.dart';

diff --git a/lib/features/dashboard/widgets/course_activity_tile.dart b/lib/features/dashboard/widgets/course_activity_tile.dart
@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
 
 // Package imports:
 import 'package:intl/intl.dart';
+import 'package:skeletonizer/skeletonizer.dart';
 
 // Project imports:
 import 'package:notredame/features/app/signets-api/models/course_activity.dart';
-import 'package:skeletonizer/skeletonizer.dart';
 
 class CourseActivityTile extends StatelessWidget {
   /// Course to display

diff --git a/lib/features/ets/events/report-news/report_news_widget.dart b/lib/features/ets/events/report-news/report_news_widget.dart
@@ -192,8 +192,8 @@ class _ReportNewsState extends State<ReportNews> {
                   const SizedBox(height: 24),
                   ElevatedButton(
                     style: ButtonStyle(
-                      backgroundColor: WidgetStateProperty.all<Color>(
-                          AppTheme.etsLightRed),
+                      backgroundColor:
+                          WidgetStateProperty.all<Color>(AppTheme.etsLightRed),
                       shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                         RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(8.0),

diff --git a/lib/features/ets/quick-link/widgets/security-info/emergency_view.dart b/lib/features/ets/quick-link/widgets/security-info/emergency_view.dart
@@ -5,9 +5,9 @@ import 'package:flutter/services.dart';
 // Package imports:
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import 'package:notredame/features/app/widgets/base_scaffold.dart';
 
 // Project imports:
+import 'package:notredame/features/app/widgets/base_scaffold.dart';
 import 'package:notredame/utils/app_theme.dart';
 import 'package:notredame/utils/utils.dart';
 
@@ -30,13 +30,14 @@ class _EmergencyViewState extends State<EmergencyView> {
       fabPosition: FloatingActionButtonLocation.centerFloat,
       fab: FloatingActionButton.extended(
         onPressed: () {
-          Utils.launchURL(
-                  'tel:${AppIntl.of(context)!.security_emergency_number}',
-                  AppIntl.of(context)!)
-              .catchError((error) {
+          try {
+            Utils.launchURL(
+                'tel:${AppIntl.of(context)!.security_emergency_number}',
+                AppIntl.of(context)!);
+          } catch (e) {
             ScaffoldMessenger.of(context)
-                .showSnackBar(SnackBar(content: Text(error.toString())));
-          });
+                .showSnackBar(SnackBar(content: Text(e.toString())));
+          }
         },
         label: Text(
           AppIntl.of(context)!.security_reach_security,

diff --git a/lib/features/ets/quick-link/widgets/security-info/security_view.dart b/lib/features/ets/quick-link/widgets/security-info/security_view.dart
@@ -6,10 +6,10 @@ import 'package:flutter/material.dart';
 // Package imports:
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:notredame/features/app/widgets/base_scaffold.dart';
 import 'package:stacked/stacked.dart';
 
 // Project imports:
+import 'package:notredame/features/app/widgets/base_scaffold.dart';
 import 'package:notredame/features/ets/quick-link/widgets/security-info/emergency_view.dart';
 import 'package:notredame/features/ets/quick-link/widgets/security-info/security_viewmodel.dart';
 import 'package:notredame/utils/app_theme.dart';
@@ -79,13 +79,16 @@ class _SecurityViewState extends State<SecurityView> {
               child: InkWell(
                 borderRadius: const BorderRadius.all(Radius.circular(10)),
                 splashColor: Colors.red.withAlpha(50),
-                onTap: () => Utils.launchURL(
+                onTap: () {
+                  try {
+                    Utils.launchURL(
                         'tel:${AppIntl.of(context)!.security_emergency_number}',
-                        AppIntl.of(context)!)
-                    .catchError((error) {
-                  ScaffoldMessenger.of(context)
-                      .showSnackBar(SnackBar(content: Text(error.toString())));
-                }),
+                        AppIntl.of(context)!);
+                  } catch (e) {
+                    ScaffoldMessenger.of(context)
+                        .showSnackBar(SnackBar(content: Text(e.toString())));
+                  }
+                },
                 child: ListTile(
                   leading: const Icon(Icons.phone, size: 30),
                   title: Text(AppIntl.of(context)!.security_emergency_call),

diff --git a/lib/features/more/faq/faq_view.dart b/lib/features/more/faq/faq_view.dart
@@ -7,10 +7,10 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:stacked/stacked.dart';
 
 // Project imports:
+import 'package:notredame/features/app/widgets/base_scaffold.dart';
 import 'package:notredame/features/more/faq/faq_viewmodel.dart';
 import 'package:notredame/features/more/faq/models/faq.dart';
 import 'package:notredame/features/more/faq/models/faq_actions.dart';
-import 'package:notredame/features/app/widgets/base_scaffold.dart';
 
 class FaqView extends StatefulWidget {
   final Color? backgroundColor;

diff --git a/lib/features/more/feedback/feedback_view.dart b/lib/features/more/feedback/feedback_view.dart
@@ -37,15 +37,14 @@ class _FeedbackViewState extends State<FeedbackView> {
                   padding: const EdgeInsets.all(8.0),
                   child: ElevatedButton(
                     onPressed: () {
-                      BetterFeedback.of(context).show((feedback) {
-                        model
-                            .sendFeedback(feedback, FeedbackType.bug)
-                            .then((value) => BetterFeedback.of(context).hide());
+                      BetterFeedback.of(context).show((feedback) async {
+                        await model.sendFeedback(feedback, FeedbackType.bug);
+                        if (!context.mounted) return;
+                        BetterFeedback.of(context).hide();
                       });
                     },
                     style: ButtonStyle(
-                        shape:
-                            WidgetStateProperty.all<RoundedRectangleBorder>(
+                        shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                       RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(8.0),
                       ),
@@ -65,15 +64,15 @@ class _FeedbackViewState extends State<FeedbackView> {
                   padding: const EdgeInsets.only(left: 8.0, right: 8.0),
                   child: ElevatedButton(
                     onPressed: () {
-                      BetterFeedback.of(context).show((feedback) {
-                        model
-                            .sendFeedback(feedback, FeedbackType.enhancement)
-                            .then((value) => BetterFeedback.of(context).hide());
+                      BetterFeedback.of(context).show((feedback) async {
+                        await model.sendFeedback(
+                            feedback, FeedbackType.enhancement);
+                        if (!context.mounted) return;
+                        BetterFeedback.of(context).hide();
                       });
                     },
                     style: ButtonStyle(
-                        shape:
-                            WidgetStateProperty.all<RoundedRectangleBorder>(
+                        shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                       RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(8.0),
                       ),

diff --git a/lib/features/more/more_viewmodel.dart b/lib/features/more/more_viewmodel.dart
@@ -113,8 +113,12 @@ class MoreViewModel extends FutureViewModel {
               .map((e) => e.featureId)
               .toList();
 
-      Future.delayed(const Duration(milliseconds: 700),
-          () => FeatureDiscovery.discoverFeatures(context, ids));
+      Future.delayed(
+          const Duration(milliseconds: 700),
+          () => {
+                if (context.mounted)
+                  {FeatureDiscovery.discoverFeatures(context, ids)}
+              });
 
       settingsManager.setBool(PreferencesFlag.discoveryMore, true);
     }

diff --git a/lib/features/schedule/schedule_viewmodel.dart b/lib/features/schedule/schedule_viewmodel.dart
@@ -441,8 +441,10 @@ class ScheduleViewModel extends FutureViewModel<List<CourseActivity>> {
               .map((e) => e.featureId)
               .toList();
 
-      Future.delayed(const Duration(milliseconds: 700),
-          () => FeatureDiscovery.discoverFeatures(context, ids));
+      Future.delayed(const Duration(milliseconds: 700), () {
+        if (!context.mounted) return;
+        FeatureDiscovery.discoverFeatures(context, ids);
+      });
     }
   }
 

diff --git a/lib/features/student/grades/grade_details/grades_details_viewmodel.dart b/lib/features/student/grades/grade_details/grades_details_viewmodel.dart
@@ -83,8 +83,10 @@ class GradesDetailsViewModel extends FutureViewModel<Course> {
           .map((e) => e.featureId)
           .toList();
 
-      Future.delayed(const Duration(seconds: 1),
-          () => FeatureDiscovery.discoverFeatures(context, ids));
+      Future.delayed(const Duration(seconds: 1), () {
+        if (!context.mounted) return;
+        FeatureDiscovery.discoverFeatures(context, ids);
+      });
 
       settingsManager.setBool(PreferencesFlag.discoveryGradeDetails, true);
     }

diff --git a/lib/features/student/grades/grades_viewmodel.dart b/lib/features/student/grades/grades_viewmodel.dart
@@ -123,8 +123,10 @@ class GradesViewModel extends FutureViewModel<Map<String, List<Course>>> {
               .map((e) => e.featureId)
               .toList();
 
-      Future.delayed(const Duration(seconds: 1),
-          () => FeatureDiscovery.discoverFeatures(context, ids));
+      Future.delayed(const Duration(seconds: 1), () {
+        if (!context.mounted) return;
+        FeatureDiscovery.discoverFeatures(context, ids);
+      });
 
       settingsManager.setBool(PreferencesFlag.discoveryStudentGrade, true);
     }