Fix onKey handler return values (flutter#473)

This fixes the return values for the onKey handlers used in the gallery code to use the newer KeyEventResult values, rather than bools. The use of the bools will soon be deprecated.
thkim1011 · Apr 12, 2021 · 4655d32 · 4655d32
1 parent 2bb63d1
commit 4655d32
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 112 deletions.
diff --git a/lib/codeviewer/code_segments.dart b/lib/codeviewer/code_segments.dart
@@ -7003,64 +7003,61 @@ class CodeSegments {
       TextSpan(style: codeStyle.punctuationStyle, text: '.'),
       TextSpan(
           style: codeStyle.baseStyle,
-          text: 'tappable\u000a                        '),
+          text: 'tappable\u000a                    '),
       TextSpan(style: codeStyle.punctuationStyle, text: '?'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.classStyle, text: 'TappableTravelDestinationItem'),
       TextSpan(style: codeStyle.punctuationStyle, text: '('),
-      TextSpan(
-          style: codeStyle.baseStyle,
-          text: '\u000a                            destination'),
+      TextSpan(style: codeStyle.baseStyle, text: 'destination'),
       TextSpan(style: codeStyle.punctuationStyle, text: ':'),
       TextSpan(style: codeStyle.baseStyle, text: ' destination'),
       TextSpan(style: codeStyle.punctuationStyle, text: ')'),
-      TextSpan(
-          style: codeStyle.baseStyle, text: '\u000a                        '),
+      TextSpan(style: codeStyle.baseStyle, text: '\u000a                    '),
       TextSpan(style: codeStyle.punctuationStyle, text: ':'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.classStyle, text: 'SelectableTravelDestinationItem'),
       TextSpan(style: codeStyle.punctuationStyle, text: '('),
       TextSpan(
           style: codeStyle.baseStyle,
-          text: '\u000a                            destination'),
+          text: '\u000a                        destination'),
       TextSpan(style: codeStyle.punctuationStyle, text: ':'),
       TextSpan(style: codeStyle.baseStyle, text: ' destination'),
       TextSpan(style: codeStyle.punctuationStyle, text: ','),
       TextSpan(
           style: codeStyle.baseStyle,
-          text: '\u000a                            isSelected'),
+          text: '\u000a                        isSelected'),
       TextSpan(style: codeStyle.punctuationStyle, text: ':'),
       TextSpan(style: codeStyle.baseStyle, text: ' _isSelected'),
       TextSpan(style: codeStyle.punctuationStyle, text: '.'),
       TextSpan(style: codeStyle.baseStyle, text: 'value'),
       TextSpan(style: codeStyle.punctuationStyle, text: ','),
       TextSpan(
           style: codeStyle.baseStyle,
-          text: '\u000a                            onSelected'),
+          text: '\u000a                        onSelected'),
       TextSpan(style: codeStyle.punctuationStyle, text: ':'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(style: codeStyle.punctuationStyle, text: '()'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(style: codeStyle.punctuationStyle, text: '{'),
       TextSpan(
           style: codeStyle.baseStyle,
-          text: '\u000a                              print'),
+          text: '\u000a                          print'),
       TextSpan(style: codeStyle.punctuationStyle, text: '('),
       TextSpan(
           style: codeStyle.stringStyle,
           text: '\u0027Selectable card state changed\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ');'),
       TextSpan(
           style: codeStyle.baseStyle,
-          text: '\u000a                              setState'),
+          text: '\u000a                          setState'),
       TextSpan(style: codeStyle.punctuationStyle, text: '(()'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(style: codeStyle.punctuationStyle, text: '{'),
       TextSpan(
           style: codeStyle.baseStyle,
-          text: '\u000a                                _isSelected'),
+          text: '\u000a                            _isSelected'),
       TextSpan(style: codeStyle.punctuationStyle, text: '.'),
       TextSpan(style: codeStyle.baseStyle, text: 'value '),
       TextSpan(style: codeStyle.punctuationStyle, text: '='),
@@ -7071,15 +7068,13 @@ class CodeSegments {
       TextSpan(style: codeStyle.baseStyle, text: 'value'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(
-          style: codeStyle.baseStyle,
-          text: '\u000a                              '),
+          style: codeStyle.baseStyle, text: '\u000a                          '),
       TextSpan(style: codeStyle.punctuationStyle, text: '});'),
       TextSpan(
-          style: codeStyle.baseStyle,
-          text: '\u000a                            '),
+          style: codeStyle.baseStyle, text: '\u000a                        '),
       TextSpan(style: codeStyle.punctuationStyle, text: '},'),
       TextSpan(
-          style: codeStyle.baseStyle, text: '\u000a                          '),
+          style: codeStyle.baseStyle, text: '\u000a                      '),
       TextSpan(style: codeStyle.punctuationStyle, text: '),'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a              '),
       TextSpan(style: codeStyle.punctuationStyle, text: '),'),

diff --git a/lib/demos/material/cards_demo.dart b/lib/demos/material/cards_demo.dart
@@ -409,18 +409,17 @@ class _CardsDemoState extends State<CardsDemo> with RestorationMixin {
                 child: (destination.cardType == CardType.standard)
                     ? TravelDestinationItem(destination: destination)
                     : destination.cardType == CardType.tappable
-                        ? TappableTravelDestinationItem(
-                            destination: destination)
-                        : SelectableTravelDestinationItem(
-                            destination: destination,
-                            isSelected: _isSelected.value,
-                            onSelected: () {
-                              print('Selectable card state changed');
-                              setState(() {
-                                _isSelected.value = !_isSelected.value;
-                              });
-                            },
-                          ),
+                    ? TappableTravelDestinationItem(destination: destination)
+                    : SelectableTravelDestinationItem(
+                        destination: destination,
+                        isSelected: _isSelected.value,
+                        onSelected: () {
+                          print('Selectable card state changed');
+                          setState(() {
+                            _isSelected.value = !_isSelected.value;
+                          });
+                        },
+                      ),
               ),
           ],
         ),

diff --git a/lib/layout/highlight_focus.dart b/lib/layout/highlight_focus.dart
@@ -82,9 +82,9 @@ class _HighlightFocusState extends State<HighlightFocus> {
                 event.logicalKey == LogicalKeyboardKey.enter ||
                 event.logicalKey == LogicalKeyboardKey.numpadEnter)) {
           widget.onPressed();
-          return true;
+          return KeyEventResult.handled;
         } else {
-          return false;
+          return KeyEventResult.ignored;
         }
       },
       child: Container(

diff --git a/lib/studies/crane/backdrop.dart b/lib/studies/crane/backdrop.dart
@@ -78,8 +78,8 @@ class _FrontLayerState extends State<_FrontLayer> {
     final crossAxisCount = isSmallDesktop
         ? 2
         : isDesktop
-            ? 4
-            : 1;
+        ? 4
+        : 1;
 
     return FocusTraversalGroup(
       policy: ReadingOrderTraversalPolicy(),

diff --git a/lib/studies/rally/login.dart b/lib/studies/rally/login.dart
@@ -301,10 +301,10 @@ class _ThumbButtonState extends State<_ThumbButton> {
               if (event.logicalKey == LogicalKeyboardKey.enter ||
                   event.logicalKey == LogicalKeyboardKey.space) {
                 widget.onTap();
-                return true;
+                return KeyEventResult.handled;
               }
             }
-            return false;
+            return KeyEventResult.ignored;
           },
           onFocusChange: (hasFocus) {
             if (hasFocus) {

diff --git a/lib/studies/reply/adaptive_nav.dart b/lib/studies/reply/adaptive_nav.dart
@@ -851,72 +851,72 @@ class _BottomAppBarActionItems extends StatelessWidget {
                   ),
                 )
               : onMailView
-                  ? Row(
-                      mainAxisSize: MainAxisSize.max,
-                      mainAxisAlignment: MainAxisAlignment.end,
-                      children: [
-                        IconButton(
-                          key: const ValueKey('star_email_button'),
-                          icon: ImageIcon(
-                            const AssetImage(
-                              '$_iconAssetLocation/twotone_star.png',
-                              package: _assetsPackage,
-                            ),
-                            color: starIconColor,
-                          ),
-                          onPressed: () {
-                            final currentEmail = model.currentEmail;
-                            if (model.isCurrentEmailStarred) {
-                              model.unstarEmail(currentEmail.id);
-                            } else {
-                              model.starEmail(currentEmail.id);
-                            }
-                            if (model.selectedMailboxPage ==
-                                MailboxPageType.starred) {
-                              mobileMailNavKey.currentState.pop();
-                              model.selectedEmailId = -1;
-                            }
-                          },
-                          color: ReplyColors.white50,
-                        ),
-                        IconButton(
-                          icon: const ImageIcon(
-                            AssetImage(
-                              '$_iconAssetLocation/twotone_delete.png',
-                              package: _assetsPackage,
-                            ),
-                          ),
-                          onPressed: () {
-                            model.deleteEmail(
-                              model.selectedEmailId,
-                            );
-
-                            mobileMailNavKey.currentState.pop();
-                            model.selectedEmailId = -1;
-                          },
-                          color: ReplyColors.white50,
+              ? Row(
+                  mainAxisSize: MainAxisSize.max,
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: [
+                    IconButton(
+                      key: const ValueKey('star_email_button'),
+                      icon: ImageIcon(
+                        const AssetImage(
+                          '$_iconAssetLocation/twotone_star.png',
+                          package: _assetsPackage,
                         ),
-                        IconButton(
-                          icon: const Icon(Icons.more_vert),
-                          onPressed: () {},
-                          color: ReplyColors.white50,
+                        color: starIconColor,
+                      ),
+                      onPressed: () {
+                        final currentEmail = model.currentEmail;
+                        if (model.isCurrentEmailStarred) {
+                          model.unstarEmail(currentEmail.id);
+                        } else {
+                          model.starEmail(currentEmail.id);
+                        }
+                        if (model.selectedMailboxPage ==
+                            MailboxPageType.starred) {
+                          mobileMailNavKey.currentState.pop();
+                          model.selectedEmailId = -1;
+                        }
+                      },
+                      color: ReplyColors.white50,
+                    ),
+                    IconButton(
+                      icon: const ImageIcon(
+                        AssetImage(
+                          '$_iconAssetLocation/twotone_delete.png',
+                          package: _assetsPackage,
                         ),
-                      ],
-                    )
-                  : Align(
-                      alignment: Alignment.centerRight,
-                      child: IconButton(
-                        key: const ValueKey('ReplySearch'),
-                        icon: const Icon(Icons.search),
-                        color: ReplyColors.white50,
-                        onPressed: () {
-                          Provider.of<EmailStore>(
-                            context,
-                            listen: false,
-                          ).onSearchPage = true;
-                        },
                       ),
+                      onPressed: () {
+                        model.deleteEmail(
+                          model.selectedEmailId,
+                        );
+
+                        mobileMailNavKey.currentState.pop();
+                        model.selectedEmailId = -1;
+                      },
+                      color: ReplyColors.white50,
+                    ),
+                    IconButton(
+                      icon: const Icon(Icons.more_vert),
+                      onPressed: () {},
+                      color: ReplyColors.white50,
                     ),
+                  ],
+                )
+              : Align(
+                  alignment: Alignment.centerRight,
+                  child: IconButton(
+                    key: const ValueKey('ReplySearch'),
+                    icon: const Icon(Icons.search),
+                    color: ReplyColors.white50,
+                    onPressed: () {
+                      Provider.of<EmailStore>(
+                        context,
+                        listen: false,
+                      ).onSearchPage = true;
+                    },
+                  ),
+                ),
         );
       },
     );

diff --git a/lib/studies/reply/mailbox_body.dart b/lib/studies/reply/mailbox_body.dart
@@ -15,13 +15,13 @@ class MailboxBody extends StatelessWidget {
     final startPadding = isTablet
         ? 60.0
         : isDesktop
-            ? 120.0
-            : 4.0;
+        ? 120.0
+        : 4.0;
     final endPadding = isTablet
         ? 30.0
         : isDesktop
-            ? 60.0
-            : 4.0;
+        ? 60.0
+        : 4.0;
 
     return Consumer<EmailStore>(
       builder: (context, model, child) {

diff --git a/lib/studies/shrine/backdrop.dart b/lib/studies/shrine/backdrop.dart
@@ -103,8 +103,8 @@ class _BackdropTitle extends AnimatedWidget {
     final menuButtonTooltip = animation.isCompleted
         ? GalleryLocalizations.of(context).shrineTooltipOpenMenu
         : animation.isDismissed
-            ? GalleryLocalizations.of(context).shrineTooltipCloseMenu
-            : null;
+        ? GalleryLocalizations.of(context).shrineTooltipCloseMenu
+        : null;
 
     return DefaultTextStyle(
       style: Theme.of(context).primaryTextTheme.headline6,