Merge pull request #728 from nextcloud/refactor/material-design-icons

Replace material design icons package

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';

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:

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

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),
         ),
       ],
     );

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),
         ),
       ],
     );

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<SettingsPage> {
             }
           },
           tooltip: AppLocalizations.of(context).settingsResetAll,
-          icon: Icon(MdiIcons.cogRefresh),
+          icon: const Icon(MdiIcons.cogRefresh),
         ),
       ],
     );
@@ -210,7 +210,7 @@ class _SettingsPageState extends State<SettingsPage> {
                 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),
                   ),
                 ),

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:

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';

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';

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

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';

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

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';

packages/neon/neon_notes/lib/pages/main.dart

@@ -55,7 +55,7 @@ class _NotesMainPageState extends State<NotesMainPage> {
             label: AppLocalizations.of(context).notes,
           ),
           BottomNavigationBarItem(
-            icon: Icon(MdiIcons.tag),
+            icon: const Icon(MdiIcons.tag),
             label: AppLocalizations.of(context).categories,
           ),
         ],

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

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';

packages/neon/neon_notifications/lib/pages/main.dart

@@ -33,7 +33,7 @@ class _NotificationsMainPageState extends State<NotificationsMainPage> {
               bloc.deleteAllNotifications();
             },
             tooltip: AppLocalizations.of(context).notificationsDismissAll,
-            child: Icon(MdiIcons.checkAll),
+            child: const Icon(MdiIcons.checkAll),
           ),
           body: NeonListView<NotificationsNotification>(
             scrollKey: 'notifications-notifications',

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