font_awesome_flutter v11 の FaIcon ウィジェットに対応

Author: sensuikan1973

integration_test/app_test.dart

@@ -93,7 +93,7 @@ Future<void> main() async {
       await waitEdaxServerResponse(tester);
 
       // shortcut cheatsheet
-      await tester.tap(find.byIcon(FontAwesomeIcons.keyboard));
+      await tester.tap(find.byType(FaIcon).first);
       await tester.pumpAndSettle();
       expect(find.text(l10n.shortcutCheatsheet), findsOneWidget);
       await tester.tapAt(const Offset(1, 1));

lib/home/home.dart

@@ -192,7 +192,7 @@ class HomeState extends State<Home> {
       centerTitle: true,
       actions: [
         IconButton(
-          icon: const Icon(FontAwesomeIcons.keyboard),
+          icon: const FaIcon(FontAwesomeIcons.keyboard),
           padding: const EdgeInsets.all(12),
           onPressed: () async => showDialog<void>(
             context: context,
@@ -214,25 +214,25 @@ class HomeState extends State<Home> {
   }
 
   Widget get _undoAllButton => IconButton(
-    icon: const Icon(FontAwesomeIcons.anglesLeft),
+    icon: const FaIcon(FontAwesomeIcons.anglesLeft),
     iconSize: _undoOrRedoIconSize,
     onPressed: () => context.read<BoardNotifier>().requestUndoAll(),
   );
 
   Widget get _undoButton => IconButton(
-    icon: const Icon(FontAwesomeIcons.angleLeft),
+    icon: const FaIcon(FontAwesomeIcons.angleLeft),
     iconSize: _undoOrRedoIconSize,
     onPressed: () => context.read<BoardNotifier>().requestUndo(),
   );
 
   Widget get _redoButton => IconButton(
-    icon: const Icon(FontAwesomeIcons.angleRight),
+    icon: const FaIcon(FontAwesomeIcons.angleRight),
     iconSize: _undoOrRedoIconSize,
     onPressed: () => context.read<BoardNotifier>().requestRedo(),
   );
 
   Widget get _redoAllButton => IconButton(
-    icon: const Icon(FontAwesomeIcons.anglesRight),
+    icon: const FaIcon(FontAwesomeIcons.anglesRight),
     iconSize: _undoOrRedoIconSize,
     onPressed: () => context.read<BoardNotifier>().requestRedoAll(),
   );

test/menu_event_test.dart

@@ -8,8 +8,8 @@ import 'package:pedax/home/setting_dialogs/bestpath_count_availability_setting_d
 import 'package:pedax/home/setting_dialogs/book_file_path_setting_dialog.dart';
 import 'package:pedax/home/setting_dialogs/hint_step_by_step_setting_dialog.dart';
 import 'package:pedax/home/setting_dialogs/level_setting_dialog.dart';
-import 'package:pedax/home/setting_dialogs/n_tasks_setting_dialog.dart';
 import 'package:pedax/home/setting_dialogs/shortcut_cheatsheet_dialog.dart';
+import 'package:pedax/home/setting_dialogs/n_tasks_setting_dialog.dart';
 import '../test_helper/edax_server.dart';
 import '../test_helper/secure_bookmark_mock.dart';
 import '../test_helper/windows_manager_mock.dart';
@@ -54,7 +54,7 @@ Future<void> main() async {
       await tester.pumpWidget(const PedaxApp());
       await waitEdaxSetuped(tester);
 
-      await tester.tap(find.byIcon(FontAwesomeIcons.keyboard));
+      await tester.tap(find.byType(FaIcon).first);
       await tester.pumpAndSettle();
       expect(find.byType(ShortcutCheatsheetDialog), findsOneWidget);
       await waitEdaxServerResponse(tester);

test/play_game_test.dart

@@ -108,15 +108,15 @@ Future<void> main() async {
       expectStoneNum(tester, SquareType.white, 2);
       expectStoneCoordinates(tester, ['d4', 'f4'], SquareType.white);
 
-      await tester.tap(find.byIcon(FontAwesomeIcons.angleLeft));
+      await tester.tap(find.byType(FaIcon).at(3));
       await waitEdaxServerResponse(tester);
       await tester.pump();
       expectStoneNum(tester, SquareType.black, 3);
       expectStoneCoordinates(tester, ['d5', 'e5', 'f5'], SquareType.black);
       expectStoneNum(tester, SquareType.white, 3);
       expectStoneCoordinates(tester, ['d4', 'e4', 'f4'], SquareType.white);
 
-      await tester.tap(find.byIcon(FontAwesomeIcons.angleRight));
+      await tester.tap(find.byType(FaIcon).at(4));
       await waitEdaxServerResponse(tester);
       await tester.pump();
       expectStoneNum(tester, SquareType.black, 5);
@@ -140,15 +140,15 @@ Future<void> main() async {
       expectStoneNum(tester, SquareType.white, 2);
       expectStoneCoordinates(tester, ['d4', 'f4'], SquareType.white);
 
-      await tester.tap(find.byIcon(FontAwesomeIcons.anglesLeft));
+      await tester.tap(find.byType(FaIcon).at(2));
       await waitEdaxServerResponse(tester);
       await tester.pump(const Duration(microseconds: 300));
       expectStoneNum(tester, SquareType.black, 2);
       expectStoneCoordinates(tester, ['e4', 'd5'], SquareType.black);
       expectStoneNum(tester, SquareType.white, 2);
       expectStoneCoordinates(tester, ['d4', 'e5'], SquareType.white);
 
-      await tester.tap(find.byIcon(FontAwesomeIcons.anglesRight));
+      await tester.tap(find.byType(FaIcon).at(3));
       await waitEdaxServerResponse(tester);
       await tester.pump(const Duration(microseconds: 300));
       expectStoneNum(tester, SquareType.black, 5);
@@ -275,15 +275,15 @@ Future<void> main() async {
       expectStoneNum(tester, SquareType.white, 6);
       expectStoneCoordinates(tester, ['e7', 'f6', 'g5', 'h4', 'h5', 'h6'], SquareType.white);
 
-      await tester.tap(find.byIcon(FontAwesomeIcons.angleLeft)); // skip pass internally in engine.
+      await tester.tap(find.byType(FaIcon).at(3));
       await waitEdaxServerResponse(tester);
       await tester.pump();
       expectStoneNum(tester, SquareType.black, 8);
       expectStoneCoordinates(tester, ['d3', 'd4', 'd5', 'e4', 'e5', 'f5', 'f6', 'f7'], SquareType.black);
       expectStoneNum(tester, SquareType.white, 4);
       expectStoneCoordinates(tester, ['g5', 'h4', 'h5', 'h6'], SquareType.white);
 
-      await tester.tap(find.byIcon(FontAwesomeIcons.angleRight)); // skip pass internally in engine.
+      await tester.tap(find.byType(FaIcon).at(4));
       await waitEdaxServerResponse(tester);
       await tester.pump();
       expectStoneNum(tester, SquareType.black, 7);