@@ -43,10 +43,7 @@ class _OrderedButtonState<T> extends State<OrderedButton<T>> {
4343 @override
4444 void initState () {
4545 super .initState ();
46- focusNode = FocusNode (
47- debugLabel: widget.name,
48- canRequestFocus: widget.canRequestFocus,
49- );
46+ focusNode = FocusNode (debugLabel: widget.name, canRequestFocus: widget.canRequestFocus);
5047 }
5148
5249 @override
@@ -70,8 +67,8 @@ class _OrderedButtonState<T> extends State<OrderedButton<T>> {
7067 @override
7168 Widget build (BuildContext context) {
7269 final FocusOrder order = switch (widget.order) {
73- final num number => NumericFocusOrder (number.toDouble ()),
74- final Object ? object => LexicalFocusOrder (object.toString ()),
70+ final num number => . numeric (number.toDouble ()),
71+ final Object ? object => . lexical (object.toString ()),
7572 };
7673
7774 return FocusTraversalOrder (
@@ -85,19 +82,13 @@ class _OrderedButtonState<T> extends State<OrderedButton<T>> {
8582 overlayColor: WidgetStateProperty <Color ?>.fromMap (
8683 // If neither of these states is active, the property will
8784 // resolve to null, deferring to the default overlay color.
88- < WidgetState , Color > {
89- WidgetState .focused: Colors .red,
90- WidgetState .hovered: Colors .blue,
91- },
85+ < WidgetState , Color > {.focused: Colors .red, .hovered: Colors .blue},
9286 ),
9387 foregroundColor: WidgetStateProperty <Color ?>.fromMap (
9488 // "WidgetState.focused | WidgetState.hovered" could be used
9589 // instead of separate map keys, but this setup allows setting
9690 // the button style to a constant value for improved efficiency.
97- < WidgetState , Color > {
98- WidgetState .focused: Colors .white,
99- WidgetState .hovered: Colors .white,
100- },
91+ < WidgetState , Color > {.focused: Colors .white, .hovered: Colors .white},
10192 ),
10293 ),
10394 onPressed: () => _handleOnPressed (),
@@ -141,13 +132,8 @@ class FocusTraversalGroupExample extends StatelessWidget {
141132 mainAxisAlignment: .center,
142133 children: List <Widget >.generate (3 , (int index) {
143134 // Order as "C" "B", "A".
144- final String order = String .fromCharCode (
145- 'A' .codeUnitAt (0 ) + (2 - index),
146- );
147- return OrderedButton <String >(
148- name: 'String: $order ' ,
149- order: order,
150- );
135+ final String order = String .fromCharCode ('A' .codeUnitAt (0 ) + (2 - index));
136+ return OrderedButton <String >(name: 'String: $order ' , order: order);
151137 }),
152138 ),
153139 ),
@@ -162,10 +148,7 @@ class FocusTraversalGroupExample extends StatelessWidget {
162148 child: Row (
163149 mainAxisAlignment: .center,
164150 children: List <Widget >.generate (3 , (int index) {
165- return OrderedButton <num >(
166- name: 'ignored num: ${3 - index }' ,
167- order: 3 - index,
168- );
151+ return OrderedButton <num >(name: 'ignored num: ${3 - index }' , order: 3 - index);
169152 }),
170153 ),
171154 ),
0 commit comments