Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Outlined icons #1011

Merged
merged 5 commits into from
Jul 8, 2024
Merged

Outlined icons #1011

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aae489f
Outlined icons
LouisPhilippeHeon Jul 8, 2024
56540f8
[BOT] Applying version.
LouisPhilippeHeon Jul 8, 2024
8cdd4d8
[BOT] Applying format.
clubapplets-server Jul 8, 2024
89f59c6
[BOT] Update golden files
clubapplets-server Jul 8, 2024
a277113
[BOT] Applying pod update.
clubapplets-server Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/features/app/widgets/base_scaffold.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
10 changes: 5 additions & 5 deletions lib/features/app/widgets/bottom_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,23 +95,23 @@ class _BottomBarState extends State<BottomBar> {
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),
];
}
Expand Down
10 changes: 5 additions & 5 deletions ...tures/app/navigation/navigation_rail.dart → ...features/app/widgets/navigation_rail.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,23 +94,23 @@ class _NavRailState extends State<NavRail> {
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)),
];
}
Expand Down
4 changes: 2 additions & 2 deletions lib/features/more/feedback/feedback_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class _FeedbackViewState extends State<FeedbackView> {
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),
),
Expand Down Expand Up @@ -82,7 +82,7 @@ class _FeedbackViewState extends State<FeedbackView> {
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),
),
Expand Down
16 changes: 9 additions & 7 deletions lib/features/more/more_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ class _MoreViewState extends State<MoreView> {
title: Text(AppIntl.of(context)!.more_report_bug),
leading: _buildDiscoveryFeatureDescriptionWidget(
context,
getProperIconAccordingToTheme(Icons.bug_report),
getProperIconAccordingToTheme(
Icons.bug_report_outlined),
DiscoveryIds.detailsMoreBugReport,
model),
onTap: () {
Expand All @@ -114,7 +115,7 @@ class _MoreViewState extends State<MoreView> {
}),
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();
Expand All @@ -133,7 +134,7 @@ class _MoreViewState extends State<MoreView> {
}),
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(
Expand All @@ -158,7 +159,7 @@ class _MoreViewState extends State<MoreView> {
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");
Expand All @@ -168,7 +169,8 @@ class _MoreViewState extends State<MoreView> {
title: Text(AppIntl.of(context)!.need_help),
leading: _buildDiscoveryFeatureDescriptionWidget(
context,
getProperIconAccordingToTheme(Icons.question_answer),
getProperIconAccordingToTheme(
Icons.question_answer_outlined),
DiscoveryIds.detailsMoreFaq,
model),
onTap: () {
Expand All @@ -181,7 +183,7 @@ class _MoreViewState extends State<MoreView> {
title: Text(AppIntl.of(context)!.settings_title),
leading: _buildDiscoveryFeatureDescriptionWidget(
context,
getProperIconAccordingToTheme(Icons.settings),
getProperIconAccordingToTheme(Icons.settings_outlined),
DiscoveryIds.detailsMoreSettings,
model),
onTap: () {
Expand All @@ -190,7 +192,7 @@ class _MoreViewState extends State<MoreView> {
}),
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(
Expand Down
6 changes: 3 additions & 3 deletions lib/features/schedule/schedule_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ class _ScheduleViewState extends State<ScheduleView>
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)) {
Expand All @@ -535,7 +535,7 @@ class _ScheduleViewState extends State<ScheduleView>
})),
_buildDiscoveryFeatureDescriptionWidget(
context,
Icons.settings,
Icons.settings_outlined,
model,
),
];
Expand All @@ -559,7 +559,7 @@ class _ScheduleViewState extends State<ScheduleView>
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(
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Binary file modified test/ui/views/goldenFiles/newsDetailsView_1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/ui/views/schedule_view_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
24 changes: 12 additions & 12 deletions test/ui/widgets/bottom_bar_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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));
Expand All @@ -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));
Expand All @@ -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));
Expand All @@ -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));
});
Expand All @@ -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));
});
Expand Down
Loading