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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PODS:
- Firebase/RemoteConfig (= 10.22.0)
- firebase_core
- Flutter
- FirebaseABTesting (10.28.0):
- FirebaseABTesting (10.29.0):
- FirebaseCore (~> 10.0)
- FirebaseAnalytics (10.22.0):
- FirebaseAnalytics/AdIdSupport (= 10.22.0)
Expand All @@ -58,9 +58,9 @@ PODS:
- FirebaseCoreInternal (~> 10.0)
- GoogleUtilities/Environment (~> 7.12)
- GoogleUtilities/Logger (~> 7.12)
- FirebaseCoreExtension (10.28.0):
- FirebaseCoreExtension (10.29.0):
- FirebaseCore (~> 10.0)
- FirebaseCoreInternal (10.28.0):
- FirebaseCoreInternal (10.29.0):
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- FirebaseCrashlytics (10.22.0):
- FirebaseCore (~> 10.5)
Expand All @@ -70,7 +70,7 @@ PODS:
- GoogleUtilities/Environment (~> 7.8)
- nanopb (< 2.30911.0, >= 2.30908.0)
- PromisesObjC (~> 2.1)
- FirebaseInstallations (10.28.0):
- FirebaseInstallations (10.29.0):
- FirebaseCore (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
Expand All @@ -82,7 +82,7 @@ PODS:
- FirebaseSharedSwift (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- FirebaseSessions (10.28.0):
- FirebaseSessions (10.29.0):
- FirebaseCore (~> 10.5)
- FirebaseCoreExtension (~> 10.0)
- FirebaseInstallations (~> 10.0)
Expand All @@ -91,7 +91,7 @@ PODS:
- GoogleUtilities/UserDefaults (~> 7.13)
- nanopb (< 2.30911.0, >= 2.30908.0)
- PromisesSwift (~> 2.1)
- FirebaseSharedSwift (10.28.0)
- FirebaseSharedSwift (10.29.0)
- Flutter (1.0.0)
- flutter_config (0.0.1):
- Flutter
Expand Down Expand Up @@ -308,16 +308,16 @@ SPEC CHECKSUMS:
firebase_core: 100945864b4aedce3cfef0c62ab864858bf013cf
firebase_crashlytics: 2b9ca6246501a03427eb43280be7615027e32142
firebase_remote_config: 5ebb1bf2503404f6b24e64f117dc6c22c0498d4c
FirebaseABTesting: 589bc28c0ab3e5554336895a34aa262e24276665
FirebaseABTesting: d87f56707159bae64e269757a6e963d490f2eebe
FirebaseAnalytics: 8d0ff929c63b7f72260f332b86ccf569776b75d3
FirebaseCore: 0326ec9b05fbed8f8716cddbf0e36894a13837f7
FirebaseCoreExtension: f63147b723e2a700fe0f34ec6fb7f358d6fe83e0
FirebaseCoreInternal: 58d07f1362fddeb0feb6a857d1d1d1c5e558e698
FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
FirebaseCrashlytics: e568d68ce89117c80cddb04073ab9018725fbb8c
FirebaseInstallations: 60c1d3bc1beef809fd1ad1189a8057a040c59f2e
FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
FirebaseRemoteConfig: e1b992a94d3674dddbcaf5d0d31a0312156ceb1c
FirebaseSessions: 20da8500ad66bb12622743e170459bf62a0768e8
FirebaseSharedSwift: 48de4aec81a6b79bb30404e5e6db43ea74848fed
FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_config: f48f0d47a284f1791aacce2687eabb3309ba7a41
flutter_custom_tabs_ios: 62439c843b2691aae516fd50119a01eb9755fff7
Expand Down
2 changes: 1 addition & 1 deletion lib/features/app/widgets/base_scaffold.dart
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
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
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
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
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
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
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
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
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
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