From 1dd45bccb6f1cbea2c24455c2d6d5ffe31ff7645 Mon Sep 17 00:00:00 2001 From: apomalyn Date: Sat, 9 Mar 2024 00:24:46 -0500 Subject: [PATCH] chore: Upgrade dep refs: #68 --- lib/core/utils/utils.dart | 2 -- lib/core/viewmodels/choose_language_viewmodel.dart | 2 -- lib/core/viewmodels/dashboard_viewmodel.dart | 2 -- lib/core/viewmodels/emergency_viewmodel.dart | 3 +-- lib/ui/views/dashboard_view.dart | 7 +------ lib/ui/views/schedule_view.dart | 4 ++-- lib/ui/views/startup_view.dart | 2 +- lib/ui/widgets/bottom_bar.dart | 10 ---------- lib/ui/widgets/custom_feedback.dart | 4 ++-- lib/ui/widgets/dismissible_card.dart | 5 ++--- lib/ui/widgets/grade_circular_progress.dart | 5 ++--- lib/ui/widgets/grade_evaluation_tile.dart | 3 +-- lib/ui/widgets/grade_not_available.dart | 3 +-- lib/ui/widgets/haptics_container.dart | 2 +- lib/ui/widgets/password_text_field.dart | 3 +-- lib/ui/widgets/schedule_calendar_tile.dart | 5 ++--- lib/ui/widgets/schedule_settings.dart | 10 ++++------ test/viewmodels/profile_viewmodel_test.dart | 2 -- 18 files changed, 21 insertions(+), 53 deletions(-) diff --git a/lib/core/utils/utils.dart b/lib/core/utils/utils.dart index 9a4654a9e..2c633bb7d 100644 --- a/lib/core/utils/utils.dart +++ b/lib/core/utils/utils.dart @@ -43,14 +43,12 @@ mixin Utils { final tempDate = currentDate.subtract(Duration(days: currentDate.weekday - 1)); firstDayOfWeek = DateTime(tempDate.year, tempDate.month, tempDate.day); - break; case StartingDayOfWeek.saturday: final tempDate = currentDate.subtract(Duration( days: currentDate.weekday == 6 || currentDate.weekday == 7 ? currentDate.weekday - 6 : currentDate.weekday + 1)); firstDayOfWeek = DateTime(tempDate.year, tempDate.month, tempDate.day); - break; // Sunday as default default: final tempDate = diff --git a/lib/core/viewmodels/choose_language_viewmodel.dart b/lib/core/viewmodels/choose_language_viewmodel.dart index 017b45802..aac3f0bc7 100644 --- a/lib/core/viewmodels/choose_language_viewmodel.dart +++ b/lib/core/viewmodels/choose_language_viewmodel.dart @@ -33,11 +33,9 @@ class ChooseLanguageViewModel extends BaseViewModel { case english: _settingsManager.setLocale('en'); languageSelectedIndex = english; - break; case french: _settingsManager.setLocale('fr'); languageSelectedIndex = french; - break; default: throw Exception( 'No valid language for the index $index passed in parameters'); diff --git a/lib/core/viewmodels/dashboard_viewmodel.dart b/lib/core/viewmodels/dashboard_viewmodel.dart index b2aaa2e06..7a147c7c9 100644 --- a/lib/core/viewmodels/dashboard_viewmodel.dart +++ b/lib/core/viewmodels/dashboard_viewmodel.dart @@ -549,11 +549,9 @@ class DashboardViewModel extends FutureViewModel> { case UpdateCode.force: isAForcedUpdate = true; message = appIntl!.update_version_message_force; - break; case UpdateCode.ask: isAForcedUpdate = false; message = appIntl!.update_version_message; - break; case UpdateCode.none: return; } diff --git a/lib/core/viewmodels/emergency_viewmodel.dart b/lib/core/viewmodels/emergency_viewmodel.dart index ad412464f..beab02726 100644 --- a/lib/core/viewmodels/emergency_viewmodel.dart +++ b/lib/core/viewmodels/emergency_viewmodel.dart @@ -5,14 +5,13 @@ import 'dart:convert'; import 'package:flutter/services.dart'; // Package imports: -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:webview_flutter/webview_flutter.dart'; // Project imports: import 'package:notredame/core/viewmodels/security_viewmodel.dart'; class EmergencyViewModel extends SecurityViewModel { - EmergencyViewModel({required AppIntl intl}) : super(intl: intl); + EmergencyViewModel({required super.intl}); /// used to load the emergency procedures html files inside the webView Future loadHtmlFromAssets(String filename, Brightness brightness, diff --git a/lib/ui/views/dashboard_view.dart b/lib/ui/views/dashboard_view.dart index 4bc70588e..50017322e 100644 --- a/lib/ui/views/dashboard_view.dart +++ b/lib/ui/views/dashboard_view.dart @@ -33,7 +33,7 @@ import 'package:notredame/ui/widgets/haptics_container.dart'; class DashboardView extends StatefulWidget { final UpdateCode updateCode; - const DashboardView({Key? key, required this.updateCode}) : super(key: key); + const DashboardView({super.key, required this.updateCode}); @override _DashboardViewState createState() => _DashboardViewState(); @@ -104,19 +104,14 @@ class _DashboardViewState extends State if (model.remoteConfigService.dashboardMessageActive) { cards.add(_buildMessageBroadcastCard(model, element)); } - break; case PreferencesFlag.aboutUsCard: cards.add(_buildAboutUsCard(model, element)); - break; case PreferencesFlag.scheduleCard: cards.add(_buildScheduleCard(model, element)); - break; case PreferencesFlag.progressBarCard: cards.add(_buildProgressBarCard(model, element)); - break; case PreferencesFlag.gradesCard: cards.add(_buildGradesCards(model, element)); - break; default: } diff --git a/lib/ui/views/schedule_view.dart b/lib/ui/views/schedule_view.dart index 7882dc341..40aa957f1 100644 --- a/lib/ui/views/schedule_view.dart +++ b/lib/ui/views/schedule_view.dart @@ -29,7 +29,7 @@ class ScheduleView extends StatefulWidget { @visibleForTesting final DateTime? initialDay; - const ScheduleView({Key? key, this.initialDay}) : super(key: key); + const ScheduleView({super.key, this.initialDay}); @override _ScheduleViewState createState() => _ScheduleViewState(); @@ -223,7 +223,7 @@ class _ScheduleViewState extends State hourIndicatorSettings: calendar_view.HourIndicatorSettings( color: scheduleLineColor, ), - liveTimeIndicatorSettings: calendar_view.HourIndicatorSettings( + liveTimeIndicatorSettings: calendar_view.LiveTimeIndicatorSettings( color: chevronColor, ), scrollOffset: 305, diff --git a/lib/ui/views/startup_view.dart b/lib/ui/views/startup_view.dart index b711ba303..44dae36a2 100644 --- a/lib/ui/views/startup_view.dart +++ b/lib/ui/views/startup_view.dart @@ -15,7 +15,7 @@ class StartUpView extends StatelessWidget { Widget build(BuildContext context) => ViewModelBuilder.nonReactive( viewModelBuilder: () => StartUpViewModel(), - onModelReady: (StartUpViewModel model) { + onViewModelReady: (StartUpViewModel model) { model.handleStartUp(); }, builder: (context, model, child) => Scaffold( diff --git a/lib/ui/widgets/bottom_bar.dart b/lib/ui/widgets/bottom_bar.dart index c4427fa94..1bd5ff55f 100644 --- a/lib/ui/widgets/bottom_bar.dart +++ b/lib/ui/widgets/bottom_bar.dart @@ -48,22 +48,17 @@ class _BottomBarState extends State { switch (routeName) { case RouterPaths.dashboard: _currentView = BottomBar.dashboardView; - break; case RouterPaths.schedule: _currentView = BottomBar.scheduleView; - break; case RouterPaths.student: _currentView = BottomBar.studentView; - break; case RouterPaths.ets: case RouterPaths.security: _currentView = BottomBar.etsView; - break; case RouterPaths.more: case RouterPaths.settings: case RouterPaths.about: _currentView = BottomBar.moreView; - break; } return _currentView; @@ -78,23 +73,18 @@ class _BottomBarState extends State { case BottomBar.dashboardView: _navigationService.pushNamedAndRemoveUntil(RouterPaths.dashboard); _analyticsService.logEvent("BottomBar", "DashboardView clicked"); - break; case BottomBar.scheduleView: _navigationService.pushNamedAndRemoveUntil(RouterPaths.schedule); _analyticsService.logEvent("BottomBar", "ScheduleView clicked"); - break; case BottomBar.studentView: _navigationService.pushNamedAndRemoveUntil(RouterPaths.student); _analyticsService.logEvent("BottomBar", "StudentView clicked"); - break; case BottomBar.etsView: _navigationService.pushNamedAndRemoveUntil(RouterPaths.ets); _analyticsService.logEvent("BottomBar", "EtsView clicked"); - break; case BottomBar.moreView: _navigationService.pushNamedAndRemoveUntil(RouterPaths.more); _analyticsService.logEvent("BottomBar", "MoreView clicked"); - break; } _currentView = index; } diff --git a/lib/ui/widgets/custom_feedback.dart b/lib/ui/widgets/custom_feedback.dart index e0ca50db0..a75d57c5b 100644 --- a/lib/ui/widgets/custom_feedback.dart +++ b/lib/ui/widgets/custom_feedback.dart @@ -13,10 +13,10 @@ import 'package:notredame/core/models/feedback.dart'; /// The submit button is disabled until the user provides the feedback type and a feedback text. class CustomFeedbackForm extends StatefulWidget { const CustomFeedbackForm({ - Key? key, + super.key, required this.onSubmit, this.scrollController, - }) : super(key: key); + }); final OnSubmit onSubmit; final ScrollController? scrollController; diff --git a/lib/ui/widgets/dismissible_card.dart b/lib/ui/widgets/dismissible_card.dart index acd0621ab..95ee1d43f 100644 --- a/lib/ui/widgets/dismissible_card.dart +++ b/lib/ui/widgets/dismissible_card.dart @@ -13,13 +13,12 @@ class DismissibleCard extends StatelessWidget { final bool isBusy; const DismissibleCard( - {Key? key, + {super.key, required this.onDismissed, required this.child, this.elevation = 1, this.cardColor, - this.isBusy = false}) - : super(key: key); + this.isBusy = false}); @override Widget build(BuildContext context) => Dismissible( diff --git a/lib/ui/widgets/grade_circular_progress.dart b/lib/ui/widgets/grade_circular_progress.dart index 431045c94..80e3a8e20 100644 --- a/lib/ui/widgets/grade_circular_progress.dart +++ b/lib/ui/widgets/grade_circular_progress.dart @@ -16,12 +16,11 @@ class GradeCircularProgress extends StatefulWidget { final double ratio; const GradeCircularProgress(this.ratio, - {Key? key, + {super.key, this.completed = false, this.finalGrade, this.studentGrade, - this.averageGrade}) - : super(key: key); + this.averageGrade}); @override _GradeCircularProgressState createState() => _GradeCircularProgressState(); diff --git a/lib/ui/widgets/grade_evaluation_tile.dart b/lib/ui/widgets/grade_evaluation_tile.dart index 8b05bf832..f43ab322a 100644 --- a/lib/ui/widgets/grade_evaluation_tile.dart +++ b/lib/ui/widgets/grade_evaluation_tile.dart @@ -25,8 +25,7 @@ class GradeEvaluationTile extends StatefulWidget { final bool isFirstEvaluation; const GradeEvaluationTile(this.evaluation, - {Key? key, this.completed = false, this.isFirstEvaluation = false}) - : super(key: key); + {super.key, this.completed = false, this.isFirstEvaluation = false}); @override _GradeEvaluationTileState createState() => _GradeEvaluationTileState(); diff --git a/lib/ui/widgets/grade_not_available.dart b/lib/ui/widgets/grade_not_available.dart index 3e6213622..579849012 100644 --- a/lib/ui/widgets/grade_not_available.dart +++ b/lib/ui/widgets/grade_not_available.dart @@ -13,8 +13,7 @@ class GradeNotAvailable extends StatelessWidget { final bool isEvaluationPeriod; const GradeNotAvailable( - {Key? key, this.onPressed, this.isEvaluationPeriod = false}) - : super(key: key); + {super.key, this.onPressed, this.isEvaluationPeriod = false}); @override Widget build(BuildContext context) { diff --git a/lib/ui/widgets/haptics_container.dart b/lib/ui/widgets/haptics_container.dart index 1eb47f3ec..f98027ff8 100644 --- a/lib/ui/widgets/haptics_container.dart +++ b/lib/ui/widgets/haptics_container.dart @@ -11,7 +11,7 @@ import 'package:flutter/services.dart'; class HapticsContainer extends StatefulWidget { final Widget child; - const HapticsContainer({Key? key, required this.child}) : super(key: key); + const HapticsContainer({super.key, required this.child}); @override _HapticsContainerState createState() => _HapticsContainerState(); diff --git a/lib/ui/widgets/password_text_field.dart b/lib/ui/widgets/password_text_field.dart index 70e472dbd..b8a6be87e 100644 --- a/lib/ui/widgets/password_text_field.dart +++ b/lib/ui/widgets/password_text_field.dart @@ -9,8 +9,7 @@ class PasswordFormField extends StatefulWidget { final VoidCallback onEditionComplete; const PasswordFormField( - {Key? key, required this.validator, required this.onEditionComplete}) - : super(key: key); + {super.key, required this.validator, required this.onEditionComplete}); @override _PasswordFormFieldState createState() => _PasswordFormFieldState(); diff --git a/lib/ui/widgets/schedule_calendar_tile.dart b/lib/ui/widgets/schedule_calendar_tile.dart index 387352f14..489160710 100644 --- a/lib/ui/widgets/schedule_calendar_tile.dart +++ b/lib/ui/widgets/schedule_calendar_tile.dart @@ -18,7 +18,7 @@ class ScheduleCalendarTile extends StatefulWidget { final BuildContext buildContext; const ScheduleCalendarTile( - {Key? key, + {super.key, this.title, this.description, this.titleStyle, @@ -28,8 +28,7 @@ class ScheduleCalendarTile extends StatefulWidget { this.borderRadius, this.start, this.end, - required this.buildContext}) - : super(key: key); + required this.buildContext}); @override _ScheduleCalendarTileState createState() => _ScheduleCalendarTileState(); diff --git a/lib/ui/widgets/schedule_settings.dart b/lib/ui/widgets/schedule_settings.dart index 77bfb930c..05f19b6d9 100644 --- a/lib/ui/widgets/schedule_settings.dart +++ b/lib/ui/widgets/schedule_settings.dart @@ -16,7 +16,7 @@ import 'package:notredame/ui/utils/app_theme.dart'; class ScheduleSettings extends StatefulWidget { final bool showHandle; - const ScheduleSettings({Key? key, this.showHandle = true}) : super(key: key); + const ScheduleSettings({super.key, this.showHandle = true}); @override _ScheduleSettingsState createState() => _ScheduleSettingsState(); @@ -74,11 +74,10 @@ class _ScheduleSettingsState extends State { ), Expanded( child: ListTileTheme( - selectedColor: Theme.of(context).textTheme.bodyLarge !.color, + selectedColor: Theme.of(context).textTheme.bodyLarge!.color, child: ListView( key: const ValueKey("SettingsScrollingArea"), - children: _buildSettings( - context, model! as ScheduleSettingsViewModel), + children: _buildSettings(context, model), ), ), ), @@ -149,7 +148,7 @@ class _ScheduleSettingsState extends State { title: Text(AppIntl.of(context)!.course_activity_group_both), )); - if(model.scheduleActivitiesByCourse[courseActivitiesAcronym] != null) { + if (model.scheduleActivitiesByCourse[courseActivitiesAcronym] != null) { for (final course in model.scheduleActivitiesByCourse[courseActivitiesAcronym]!) { tiles.add(ListTile( @@ -162,7 +161,6 @@ class _ScheduleSettingsState extends State { )); } } - if (model.scheduleActivitiesByCourse.values.length > 1) { tiles.add(const Divider(endIndent: 50, thickness: 1.5)); diff --git a/test/viewmodels/profile_viewmodel_test.dart b/test/viewmodels/profile_viewmodel_test.dart index 71a984bb7..79dc4b1a0 100644 --- a/test/viewmodels/profile_viewmodel_test.dart +++ b/test/viewmodels/profile_viewmodel_test.dart @@ -8,11 +8,9 @@ import 'package:notredame/core/constants/programs_credits.dart'; import 'package:notredame/core/managers/user_repository.dart'; import 'package:notredame/core/viewmodels/profile_viewmodel.dart'; import '../helpers.dart'; -import '../mock/managers/settings_manager_mock.dart'; import '../mock/managers/user_repository_mock.dart'; late UserRepositoryMock userRepositoryMock; -late SettingsManagerMock settingsManagerMock; late ProfileViewModel viewModel;