From 28c72178cad2aac2e40540ed2ef66b85d7a55514 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Thu, 7 Sep 2023 14:41:52 +0200 Subject: [PATCH] refactor(neon,neon_files,neon_news,neon_notes,neon_notifications,app): Replace material design icons package Signed-off-by: jld3103 --- .../app/integration_test/screenshot_test.dart | 2 +- packages/app/pubspec.lock | 16 ++++++++-------- packages/app/pubspec.yaml | 2 +- .../neon/lib/src/pages/account_settings.dart | 4 ++-- .../lib/src/pages/nextcloud_app_settings.dart | 4 ++-- packages/neon/neon/lib/src/pages/settings.dart | 6 +++--- packages/neon/neon/pubspec.yaml | 2 +- packages/neon/neon_files/lib/neon_files.dart | 2 +- .../neon_files/lib/widgets/file_list_tile.dart | 2 +- packages/neon/neon_files/pubspec.yaml | 2 +- packages/neon/neon_news/lib/neon_news.dart | 2 +- packages/neon/neon_news/pubspec.yaml | 2 +- packages/neon/neon_notes/lib/neon_notes.dart | 2 +- packages/neon/neon_notes/lib/pages/main.dart | 2 +- packages/neon/neon_notes/pubspec.yaml | 2 +- .../lib/neon_notifications.dart | 2 +- .../neon/neon_notifications/lib/pages/main.dart | 2 +- packages/neon/neon_notifications/pubspec.yaml | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/app/integration_test/screenshot_test.dart b/packages/app/integration_test/screenshot_test.dart index 1e57e178..def82780 100644 --- a/packages/app/integration_test/screenshot_test.dart +++ b/packages/app/integration_test/screenshot_test.dart @@ -4,9 +4,9 @@ import 'package:app/apps.dart'; import 'package:app/branding.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:neon/models.dart'; import 'package:neon/neon.dart'; import 'package:neon/nextcloud.dart'; diff --git a/packages/app/pubspec.lock b/packages/app/pubspec.lock index 4023b167..9a9d68c7 100644 --- a/packages/app/pubspec.lock +++ b/packages/app/pubspec.lock @@ -342,6 +342,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.17+2" + flutter_material_design_icons: + dependency: "direct dev" + description: + name: flutter_material_design_icons + sha256: "2b000c56e4ea38bc785fe143404ace0ae0a98b86501ec80a52ec840cd07597cf" + url: "https://pub.dev" + source: hosted + version: "1.1.7296" flutter_native_splash: dependency: transitive description: @@ -570,14 +578,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.5.0" - material_design_icons_flutter: - dependency: "direct dev" - description: - name: material_design_icons_flutter - sha256: "6f986b7a51f3ad4c00e33c5c84e8de1bdd140489bbcdc8b66fc1283dad4dea5a" - url: "https://pub.dev" - source: hosted - version: "7.0.7296" menu_base: dependency: transitive description: diff --git a/packages/app/pubspec.yaml b/packages/app/pubspec.yaml index 954431aa..6de39d11 100644 --- a/packages/app/pubspec.yaml +++ b/packages/app/pubspec.yaml @@ -32,11 +32,11 @@ dependencies: path: packages/neon/neon_notifications dev_dependencies: + flutter_material_design_icons: ^1.1.7296 flutter_test: sdk: flutter integration_test: sdk: flutter - material_design_icons_flutter: ^7.0.7296 neon_lints: git: url: https://github.com/nextcloud/neon diff --git a/packages/neon/neon/lib/src/pages/account_settings.dart b/packages/neon/neon/lib/src/pages/account_settings.dart index 16b395c2..ef1d2c2f 100644 --- a/packages/neon/neon/lib/src/pages/account_settings.dart +++ b/packages/neon/neon/lib/src/pages/account_settings.dart @@ -1,6 +1,6 @@ import 'package:filesize/filesize.dart'; import 'package:flutter/material.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:neon/l10n/localizations.dart'; import 'package:neon/src/bloc/result_builder.dart'; import 'package:neon/src/blocs/accounts.dart'; @@ -70,7 +70,7 @@ class AccountSettingsPage extends StatelessWidget { } }, tooltip: AppLocalizations.of(context).settingsResetFor(name), - icon: Icon(MdiIcons.cogRefresh), + icon: const Icon(MdiIcons.cogRefresh), ), ], ); diff --git a/packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart b/packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart index b67458d4..391b5a94 100644 --- a/packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart +++ b/packages/neon/neon/lib/src/pages/nextcloud_app_settings.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:neon/l10n/localizations.dart'; import 'package:neon/src/models/app_implementation.dart'; import 'package:neon/src/settings/models/select_option.dart'; @@ -34,7 +34,7 @@ class NextcloudAppSettingsPage extends StatelessWidget { } }, tooltip: AppLocalizations.of(context).settingsResetFor(appImplementation.name(context)), - icon: Icon(MdiIcons.cogRefresh), + icon: const Icon(MdiIcons.cogRefresh), ), ], ); diff --git a/packages/neon/neon/lib/src/pages/settings.dart b/packages/neon/neon/lib/src/pages/settings.dart index 63188e4f..8923f7d4 100644 --- a/packages/neon/neon/lib/src/pages/settings.dart +++ b/packages/neon/neon/lib/src/pages/settings.dart @@ -1,6 +1,6 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:neon/l10n/localizations.dart'; import 'package:neon/src/blocs/accounts.dart'; import 'package:neon/src/models/account.dart'; @@ -73,7 +73,7 @@ class _SettingsPageState extends State { } }, tooltip: AppLocalizations.of(context).settingsResetAll, - icon: Icon(MdiIcons.cogRefresh), + icon: const Icon(MdiIcons.cogRefresh), ), ], ); @@ -210,7 +210,7 @@ class _SettingsPageState extends State { CustomSettingsTile( title: ElevatedButton.icon( onPressed: () async => const LoginRoute().push(context), - icon: Icon(MdiIcons.accountPlus), + icon: const Icon(MdiIcons.accountPlus), label: Text(AppLocalizations.of(context).globalOptionsAccountsAdd), ), ), diff --git a/packages/neon/neon/pubspec.yaml b/packages/neon/neon/pubspec.yaml index 611d785a..c598b816 100644 --- a/packages/neon/neon/pubspec.yaml +++ b/packages/neon/neon/pubspec.yaml @@ -18,6 +18,7 @@ dependencies: flutter_local_notifications: ^15.1.1 flutter_localizations: sdk: flutter + flutter_material_design_icons: ^1.1.7296 flutter_native_splash: ^2.3.2 flutter_svg: ^2.0.7 flutter_zxing: ^1.4.1 @@ -27,7 +28,6 @@ dependencies: intersperse: ^2.0.0 intl: ^0.18.1 json_annotation: ^4.8.1 - material_design_icons_flutter: ^7.0.7296 meta: ^1.9.1 nextcloud: git: diff --git a/packages/neon/neon_files/lib/neon_files.dart b/packages/neon/neon_files/lib/neon_files.dart index 3b41ab63..1c63d961 100644 --- a/packages/neon/neon_files/lib/neon_files.dart +++ b/packages/neon/neon_files/lib/neon_files.dart @@ -8,10 +8,10 @@ import 'package:file_icons/file_icons.dart'; import 'package:file_picker/file_picker.dart'; import 'package:filesize/filesize.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:go_router/go_router.dart'; import 'package:image_picker/image_picker.dart'; import 'package:intersperse/intersperse.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:neon/blocs.dart'; import 'package:neon/models.dart'; import 'package:neon/nextcloud.dart'; diff --git a/packages/neon/neon_files/lib/widgets/file_list_tile.dart b/packages/neon/neon_files/lib/widgets/file_list_tile.dart index fb5aaf85..f44db77e 100644 --- a/packages/neon/neon_files/lib/widgets/file_list_tile.dart +++ b/packages/neon/neon_files/lib/widgets/file_list_tile.dart @@ -1,6 +1,6 @@ import 'package:filesize/filesize.dart'; import 'package:flutter/material.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; +import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:neon/utils.dart'; import 'package:neon/widgets.dart'; import 'package:neon_files/l10n/localizations.dart'; diff --git a/packages/neon/neon_files/pubspec.yaml b/packages/neon/neon_files/pubspec.yaml index e6f899eb..bf4dce86 100644 --- a/packages/neon/neon_files/pubspec.yaml +++ b/packages/neon/neon_files/pubspec.yaml @@ -16,10 +16,10 @@ dependencies: filesize: ^2.0.1 flutter: sdk: flutter + flutter_material_design_icons: ^1.1.7296 go_router: ^10.1.2 image_picker: ^1.0.4 intersperse: ^2.0.0 - material_design_icons_flutter: ^7.0.7296 neon: git: url: https://github.com/nextcloud/neon diff --git a/packages/neon/neon_news/lib/neon_news.dart b/packages/neon/neon_news/lib/neon_news.dart index 8e5c18cd..de7c26c7 100644 --- a/packages/neon/neon_news/lib/neon_news.dart +++ b/packages/neon/neon_news/lib/neon_news.dart @@ -5,10 +5,10 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_html/flutter_html.dart'; +import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:go_router/go_router.dart'; import 'package:html/dom.dart' as html_dom; import 'package:html/parser.dart' as html_parser; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:neon/blocs.dart'; import 'package:neon/models.dart'; import 'package:neon/nextcloud.dart'; diff --git a/packages/neon/neon_news/pubspec.yaml b/packages/neon/neon_news/pubspec.yaml index 4f16bc8f..288afaf7 100644 --- a/packages/neon/neon_news/pubspec.yaml +++ b/packages/neon/neon_news/pubspec.yaml @@ -10,9 +10,9 @@ dependencies: flutter: sdk: flutter flutter_html: ^3.0.0-beta.2 + flutter_material_design_icons: ^1.1.7296 go_router: ^10.1.2 html: ^0.15.4 - material_design_icons_flutter: ^7.0.7296 neon: git: url: https://github.com/nextcloud/neon diff --git a/packages/neon/neon_notes/lib/neon_notes.dart b/packages/neon/neon_notes/lib/neon_notes.dart index f44a5384..6ebd227b 100644 --- a/packages/neon/neon_notes/lib/neon_notes.dart +++ b/packages/neon/neon_notes/lib/neon_notes.dart @@ -7,8 +7,8 @@ import 'package:built_collection/built_collection.dart'; import 'package:crypto/crypto.dart'; import 'package:flutter/material.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; +import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:go_router/go_router.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:neon/blocs.dart'; import 'package:neon/models.dart'; import 'package:neon/nextcloud.dart'; diff --git a/packages/neon/neon_notes/lib/pages/main.dart b/packages/neon/neon_notes/lib/pages/main.dart index a0403cf2..eecab6b3 100644 --- a/packages/neon/neon_notes/lib/pages/main.dart +++ b/packages/neon/neon_notes/lib/pages/main.dart @@ -55,7 +55,7 @@ class _NotesMainPageState extends State { label: AppLocalizations.of(context).notes, ), BottomNavigationBarItem( - icon: Icon(MdiIcons.tag), + icon: const Icon(MdiIcons.tag), label: AppLocalizations.of(context).categories, ), ], diff --git a/packages/neon/neon_notes/pubspec.yaml b/packages/neon/neon_notes/pubspec.yaml index 84fe0751..0fbee667 100644 --- a/packages/neon/neon_notes/pubspec.yaml +++ b/packages/neon/neon_notes/pubspec.yaml @@ -12,8 +12,8 @@ dependencies: flutter: sdk: flutter flutter_markdown: ^0.6.17+1 + flutter_material_design_icons: ^1.1.7296 go_router: ^10.1.2 - material_design_icons_flutter: ^7.0.7296 neon: git: url: https://github.com/nextcloud/neon diff --git a/packages/neon/neon_notifications/lib/neon_notifications.dart b/packages/neon/neon_notifications/lib/neon_notifications.dart index 7082cfff..c2a5d210 100644 --- a/packages/neon/neon_notifications/lib/neon_notifications.dart +++ b/packages/neon/neon_notifications/lib/neon_notifications.dart @@ -3,8 +3,8 @@ library notifications; import 'dart:async'; import 'package:flutter/material.dart'; +import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:go_router/go_router.dart'; -import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:neon/blocs.dart'; import 'package:neon/models.dart'; import 'package:neon/nextcloud.dart'; diff --git a/packages/neon/neon_notifications/lib/pages/main.dart b/packages/neon/neon_notifications/lib/pages/main.dart index 6fd98389..0d2172c5 100644 --- a/packages/neon/neon_notifications/lib/pages/main.dart +++ b/packages/neon/neon_notifications/lib/pages/main.dart @@ -33,7 +33,7 @@ class _NotificationsMainPageState extends State { bloc.deleteAllNotifications(); }, tooltip: AppLocalizations.of(context).notificationsDismissAll, - child: Icon(MdiIcons.checkAll), + child: const Icon(MdiIcons.checkAll), ), body: NeonListView( scrollKey: 'notifications-notifications', diff --git a/packages/neon/neon_notifications/pubspec.yaml b/packages/neon/neon_notifications/pubspec.yaml index eacd8318..09ece783 100644 --- a/packages/neon/neon_notifications/pubspec.yaml +++ b/packages/neon/neon_notifications/pubspec.yaml @@ -9,8 +9,8 @@ environment: dependencies: flutter: sdk: flutter + flutter_material_design_icons: ^1.1.7296 go_router: ^10.1.2 - material_design_icons_flutter: ^7.0.7296 neon: git: url: https://github.com/nextcloud/neon