diff --git a/lib/features/app/widgets/base_scaffold.dart b/lib/features/app/widgets/base_scaffold.dart index 2ec804c88..db985defc 100644 --- a/lib/features/app/widgets/base_scaffold.dart +++ b/lib/features/app/widgets/base_scaffold.dart @@ -10,7 +10,7 @@ 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/navigation/navigation_rail.dart'; +import 'package:notredame/features/app/widgets/navigation_rail.dart'; import 'package:notredame/features/app/widgets/bottom_bar.dart'; import 'package:notredame/utils/app_theme.dart'; import 'package:notredame/utils/loading.dart'; diff --git a/lib/features/app/widgets/bottom_bar.dart b/lib/features/app/widgets/bottom_bar.dart index a5a6182ad..c634e50dc 100644 --- a/lib/features/app/widgets/bottom_bar.dart +++ b/lib/features/app/widgets/bottom_bar.dart @@ -95,23 +95,23 @@ class _BottomBarState extends State { return [ BottomNavigationBarItem( icon: _buildDiscoveryFeatureDescriptionWidget( - context, RouterPaths.dashboard, Icons.dashboard), + context, RouterPaths.dashboard, Icons.dashboard_outlined), label: AppIntl.of(context)!.title_dashboard), BottomNavigationBarItem( icon: _buildDiscoveryFeatureDescriptionWidget( - context, RouterPaths.schedule, Icons.schedule), + context, RouterPaths.schedule, Icons.schedule_outlined), label: AppIntl.of(context)!.title_schedule), BottomNavigationBarItem( icon: _buildDiscoveryFeatureDescriptionWidget( - context, RouterPaths.student, Icons.school), + context, RouterPaths.student, Icons.school_outlined), label: AppIntl.of(context)!.title_student), BottomNavigationBarItem( icon: _buildDiscoveryFeatureDescriptionWidget( - context, RouterPaths.ets, Icons.account_balance), + context, RouterPaths.ets, Icons.account_balance_outlined), label: AppIntl.of(context)!.title_ets), BottomNavigationBarItem( icon: _buildDiscoveryFeatureDescriptionWidget( - context, RouterPaths.more, Icons.dehaze), + context, RouterPaths.more, Icons.menu_outlined), label: AppIntl.of(context)!.title_more), ]; } diff --git a/lib/features/app/navigation/navigation_rail.dart b/lib/features/app/widgets/navigation_rail.dart similarity index 93% rename from lib/features/app/navigation/navigation_rail.dart rename to lib/features/app/widgets/navigation_rail.dart index 83134cd49..6a025ae5e 100644 --- a/lib/features/app/navigation/navigation_rail.dart +++ b/lib/features/app/widgets/navigation_rail.dart @@ -94,23 +94,23 @@ class _NavRailState extends State { return [ NavigationRailDestination( icon: _buildDiscoveryFeatureDescriptionWidget( - context, RouterPaths.dashboard, Icons.dashboard), + context, RouterPaths.dashboard, Icons.dashboard_outlined), label: Text(AppIntl.of(context)!.title_dashboard)), NavigationRailDestination( icon: _buildDiscoveryFeatureDescriptionWidget( - context, RouterPaths.schedule, Icons.schedule), + context, RouterPaths.schedule, Icons.schedule_outlined), label: Text(AppIntl.of(context)!.title_schedule)), NavigationRailDestination( icon: _buildDiscoveryFeatureDescriptionWidget( - context, RouterPaths.student, Icons.school), + context, RouterPaths.student, Icons.school_outlined), label: Text(AppIntl.of(context)!.title_student)), NavigationRailDestination( icon: _buildDiscoveryFeatureDescriptionWidget( - context, RouterPaths.ets, Icons.account_balance), + context, RouterPaths.ets, Icons.account_balance_outlined), label: Text(AppIntl.of(context)!.title_ets)), NavigationRailDestination( icon: _buildDiscoveryFeatureDescriptionWidget( - context, RouterPaths.more, Icons.dehaze), + context, RouterPaths.more, Icons.menu_outlined), label: Text(AppIntl.of(context)!.title_more)), ]; } diff --git a/lib/features/more/feedback/feedback_view.dart b/lib/features/more/feedback/feedback_view.dart index af8748bcb..31e997acb 100644 --- a/lib/features/more/feedback/feedback_view.dart +++ b/lib/features/more/feedback/feedback_view.dart @@ -54,7 +54,7 @@ class _FeedbackViewState extends State { context, AppIntl.of(context)!.more_report_bug_bug, AppIntl.of(context)!.more_report_bug_bug_subtitle, - Icons.bug_report, + Icons.bug_report_outlined, const Color.fromRGBO(252, 196, 238, 1), const Color.fromRGBO(153, 78, 174, 1), ), @@ -82,7 +82,7 @@ class _FeedbackViewState extends State { context, AppIntl.of(context)!.more_report_bug_feature, AppIntl.of(context)!.more_report_bug_feature_subtitle, - Icons.design_services, + Icons.design_services_outlined, const Color.fromRGBO(63, 219, 251, 1), const Color.fromRGBO(14, 127, 188, 1), ), diff --git a/lib/features/more/more_view.dart b/lib/features/more/more_view.dart index 520d4189d..5ed6bbc89 100644 --- a/lib/features/more/more_view.dart +++ b/lib/features/more/more_view.dart @@ -105,7 +105,8 @@ class _MoreViewState extends State { title: Text(AppIntl.of(context)!.more_report_bug), leading: _buildDiscoveryFeatureDescriptionWidget( context, - getProperIconAccordingToTheme(Icons.bug_report), + getProperIconAccordingToTheme( + Icons.bug_report_outlined), DiscoveryIds.detailsMoreBugReport, model), onTap: () { @@ -114,7 +115,7 @@ class _MoreViewState extends State { }), ListTile( title: Text(AppIntl.of(context)!.in_app_review_title), - leading: const Icon(Icons.rate_review), + leading: const Icon(Icons.rate_review_outlined), onTap: () { _analyticsService.logEvent(tag, "Rate us clicked"); MoreViewModel.launchInAppReview(); @@ -133,7 +134,7 @@ class _MoreViewState extends State { }), ListTile( title: Text(AppIntl.of(context)!.more_open_source_licenses), - leading: const Icon(Icons.code), + leading: const Icon(Icons.code_outlined), onTap: () { _analyticsService.logEvent(tag, "Rate us clicked"); Navigator.of(context).push(PageRouteBuilder( @@ -158,7 +159,7 @@ class _MoreViewState extends State { if (model.privacyPolicyToggle) ListTile( title: Text(AppIntl.of(context)!.privacy_policy), - leading: const Icon(Icons.privacy_tip), + leading: const Icon(Icons.privacy_tip_outlined), onTap: () { _analyticsService.logEvent( tag, "Confidentiality clicked"); @@ -168,7 +169,8 @@ class _MoreViewState extends State { title: Text(AppIntl.of(context)!.need_help), leading: _buildDiscoveryFeatureDescriptionWidget( context, - getProperIconAccordingToTheme(Icons.question_answer), + getProperIconAccordingToTheme( + Icons.question_answer_outlined), DiscoveryIds.detailsMoreFaq, model), onTap: () { @@ -181,7 +183,7 @@ class _MoreViewState extends State { title: Text(AppIntl.of(context)!.settings_title), leading: _buildDiscoveryFeatureDescriptionWidget( context, - getProperIconAccordingToTheme(Icons.settings), + getProperIconAccordingToTheme(Icons.settings_outlined), DiscoveryIds.detailsMoreSettings, model), onTap: () { @@ -190,7 +192,7 @@ class _MoreViewState extends State { }), ListTile( title: Text(AppIntl.of(context)!.more_log_out), - leading: const Icon(Icons.logout), + leading: const Icon(Icons.logout_outlined), onTap: () => Navigator.of(context).push( PageRouteBuilder( pageBuilder: (context, _, __) => AlertDialog( diff --git a/lib/features/schedule/schedule_view.dart b/lib/features/schedule/schedule_view.dart index f4d64e461..7fe9a7e03 100644 --- a/lib/features/schedule/schedule_view.dart +++ b/lib/features/schedule/schedule_view.dart @@ -517,7 +517,7 @@ class _ScheduleViewState extends State if ((model.settings[PreferencesFlag.scheduleShowTodayBtn] as bool) == true) IconButton( - icon: const Icon(Icons.today), + icon: const Icon(Icons.today_outlined), onPressed: () => setState(() { if (!(model.settings[PreferencesFlag.scheduleListView] as bool)) { @@ -535,7 +535,7 @@ class _ScheduleViewState extends State })), _buildDiscoveryFeatureDescriptionWidget( context, - Icons.settings, + Icons.settings_outlined, model, ), ]; @@ -559,7 +559,7 @@ class _ScheduleViewState extends State pulseDuration: const Duration(seconds: 5), onComplete: () => model.discoveryCompleted(), child: IconButton( - icon: const Icon(Icons.settings), + icon: const Icon(Icons.settings_outlined), onPressed: () async { _analyticsService.logEvent(tag, "Settings clicked"); await showModalBottomSheet( diff --git a/pubspec.yaml b/pubspec.yaml index 26d0d52f4..3139a79b6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ description: The 4th generation of ÉTSMobile, the main gateway between the Éco # pub.dev using `pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 4.44.0+1 +version: 4.45.0+1 environment: sdk: '>=3.3.0 <4.0.0' diff --git a/test/ui/views/schedule_view_test.dart b/test/ui/views/schedule_view_test.dart index 516bbfcdb..0fe4d62b1 100644 --- a/test/ui/views/schedule_view_test.dart +++ b/test/ui/views/schedule_view_test.dart @@ -295,7 +295,7 @@ void main() { reason: "The settings page should not be open"); // Tap on the settings button - await tester.tap(find.byIcon(Icons.settings)); + await tester.tap(find.byIcon(Icons.settings_outlined)); // Reload view await tester.pumpAndSettle(); diff --git a/test/ui/widgets/bottom_bar_test.dart b/test/ui/widgets/bottom_bar_test.dart index ca775e987..5dedfb8fa 100644 --- a/test/ui/widgets/bottom_bar_test.dart +++ b/test/ui/widgets/bottom_bar_test.dart @@ -51,12 +51,12 @@ void main() { localizedWidget(child: FeatureDiscovery(child: BottomBar()))); await tester.pumpAndSettle(); - await tester.tap(find.byIcon(Icons.school)); - await tester.tap(find.byIcon(Icons.school)); - await tester.tap(find.byIcon(Icons.school)); - await tester.tap(find.byIcon(Icons.school)); - await tester.tap(find.byIcon(Icons.school)); - await tester.tap(find.byIcon(Icons.school)); + await tester.tap(find.byIcon(Icons.school_outlined)); + await tester.tap(find.byIcon(Icons.school_outlined)); + await tester.tap(find.byIcon(Icons.school_outlined)); + await tester.tap(find.byIcon(Icons.school_outlined)); + await tester.tap(find.byIcon(Icons.school_outlined)); + await tester.tap(find.byIcon(Icons.school_outlined)); verify(navigationServiceMock.pushNamedAndRemoveUntil(RouterPaths.student)) .called(1); @@ -68,8 +68,8 @@ void main() { localizedWidget(child: FeatureDiscovery(child: BottomBar()))); await tester.pumpAndSettle(); - await tester.tap(find.byIcon(Icons.schedule)); - await tester.tap(find.byIcon(Icons.dashboard)); + await tester.tap(find.byIcon(Icons.schedule_outlined)); + await tester.tap(find.byIcon(Icons.dashboard_outlined)); verify(navigationServiceMock .pushNamedAndRemoveUntil(RouterPaths.dashboard)); @@ -80,7 +80,7 @@ void main() { localizedWidget(child: FeatureDiscovery(child: BottomBar()))); await tester.pumpAndSettle(); - await tester.tap(find.byIcon(Icons.schedule)); + await tester.tap(find.byIcon(Icons.schedule_outlined)); verify(navigationServiceMock .pushNamedAndRemoveUntil(RouterPaths.schedule)); @@ -91,7 +91,7 @@ void main() { localizedWidget(child: FeatureDiscovery(child: BottomBar()))); await tester.pumpAndSettle(); - await tester.tap(find.byIcon(Icons.school)); + await tester.tap(find.byIcon(Icons.school_outlined)); verify( navigationServiceMock.pushNamedAndRemoveUntil(RouterPaths.student)); @@ -102,7 +102,7 @@ void main() { localizedWidget(child: FeatureDiscovery(child: BottomBar()))); await tester.pumpAndSettle(); - await tester.tap(find.byIcon(Icons.account_balance)); + await tester.tap(find.byIcon(Icons.account_balance_outlined)); verify(navigationServiceMock.pushNamedAndRemoveUntil(RouterPaths.ets)); }); @@ -112,7 +112,7 @@ void main() { localizedWidget(child: FeatureDiscovery(child: BottomBar()))); await tester.pumpAndSettle(); - await tester.tap(find.byIcon(Icons.dehaze)); + await tester.tap(find.byIcon(Icons.menu_outlined)); verify(navigationServiceMock.pushNamedAndRemoveUntil(RouterPaths.more)); });