Update Flutter version

assets/markdown/bridge.md

@@ -116,8 +116,8 @@ class JsonHelper {
     final json = jsonDecode(jsonString)! as Map<String, dynamic>;
 
     return switch (T) {
-      Customer _ => Customer.fromJson(json) as T,
-      Order _ => Order.fromJson(json) as T,
+      const (Customer) => Customer.fromJson(json) as T,
+      const (Order) => Order.fromJson(json) as T,
       _ => throw Exception("Type of '$T' is not supported."),
     };
   }

assets/markdown/builder.md

@@ -90,7 +90,7 @@ class McChickenPatty extends Ingredient {
     name = 'McChicken Patty';
     allergens = [
       'Wheat',
-      'Cooked in the same fryer that we use for Buttermilk Crispy Chicken which contains a milk allergen'
+      'Cooked in the same fryer that we use for Buttermilk Crispy Chicken which contains a milk allergen',
     ];
   }
 }
@@ -192,7 +192,7 @@ class Burger {
       _ingredients.map((x) => x.getName()).join(', ');
 
   String getFormattedAllergens() => <String>{
-        for (final ingredient in _ingredients) ...ingredient.getAllergens()
+        for (final ingredient in _ingredients) ...ingredient.getAllergens(),
       }.join(', ');
 
   String getFormattedPrice() => '\$${_price.toStringAsFixed(2)}';
@@ -460,7 +460,7 @@ class _BuilderExampleState extends State<BuilderExample> {
       BurgerMenuItem(
         label: 'McChicken\u00AE',
         burgerBuilder: McChickenBuilder(),
-      )
+      ),
     ]);
 
     _selectedBurgerMenuItem = _burgerMenuItems[0];

assets/markdown/flyweight.md

@@ -223,19 +223,14 @@ class _FlyweightExampleState extends State<FlyweightExample> {
   Widget build(BuildContext context) {
     return Stack(
       children: <Widget>[
-        for (var shape in _shapesList)
-          PositionedShapeWrapper(
-            shape: shape,
-          ),
+        for (final shape in _shapesList) PositionedShapeWrapper(shape: shape),
         Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
             SwitchListTile.adaptive(
               title: const Text(
                 'Use flyweight factory',
-                style: TextStyle(
-                  fontWeight: FontWeight.bold,
-                ),
+                style: TextStyle(fontWeight: FontWeight.bold),
               ),
               activeColor: Colors.black,
               value: _useFlyweightFactory,
@@ -246,9 +241,7 @@ class _FlyweightExampleState extends State<FlyweightExample> {
         Center(
           child: Text(
             'Shape instances count: $_shapeInstancesCount',
-            style: const TextStyle(
-              fontWeight: FontWeight.bold,
-            ),
+            style: const TextStyle(fontWeight: FontWeight.bold),
           ),
         ),
       ],

assets/markdown/interpreter.md

@@ -201,7 +201,7 @@ class _InterpreterExampleState extends State<InterpreterExample> {
     '20 3 5 * - 2 3 * +',
     '1 1 1 1 1 + + + * 2 -',
     '123 12 1 - - 12 9 * -',
-    '9 8 7 6 5 4 3 2 1 + - + - + - + -'
+    '9 8 7 6 5 4 3 2 1 + - + - + - + -',
   ];
 
   @override
@@ -215,10 +215,8 @@ class _InterpreterExampleState extends State<InterpreterExample> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
-            for (var postfixExpression in _postfixExpressions)
-              ExpressionSection(
-                postfixExpression: postfixExpression,
-              ),
+            for (final postfixExpression in _postfixExpressions)
+              ExpressionSection(postfixExpression: postfixExpression),
           ],
         ),
       ),
@@ -279,11 +277,11 @@ class _ExpressionSectionState extends State<ExpressionSection> {
           secondChild: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
-              for (var solutionStep in _solutionSteps)
+              for (final solutionStep in _solutionSteps)
                 Text(
                   solutionStep,
                   style: Theme.of(context).textTheme.titleSmall,
-                )
+                ),
             ],
           ),
           crossFadeState: _solutionSteps.isEmpty

assets/markdown/observer.md

@@ -329,9 +329,9 @@ class _ObserverExampleState extends State<ObserverExample> {
             Column(
               children: [
                 for (final stock in _stockEntries.reversed)
-                  StockRow(stock: stock)
+                  StockRow(stock: stock),
               ],
-            )
+            ),
           ],
         ),
       ),

assets/markdown/proxy.md

@@ -155,7 +155,7 @@ class _ProxyExampleState extends State<ProxyExample> {
               textAlign: TextAlign.center,
             ),
             const SizedBox(height: LayoutConstants.spaceL),
-            for (var customer in _customerList)
+            for (final customer in _customerList)
               Card(
                 child: ListTile(
                   leading: CircleAvatar(

assets/markdown/singleton.md

@@ -98,7 +98,7 @@ class _SingletonExampleState extends State<SingletonExample> {
   final List<ExampleStateBase> stateList = [
     ExampleState(),
     ExampleStateByDefinition.getState(),
-    ExampleStateWithoutSingleton()
+    ExampleStateWithoutSingleton(),
   ];
 
   void _setTextValues([String text = 'Singleton']) {
@@ -125,14 +125,12 @@ class _SingletonExampleState extends State<SingletonExample> {
         ),
         child: Column(
           children: <Widget>[
-            for (var state in stateList)
+            for (final state in stateList)
               Padding(
                 padding: const EdgeInsets.only(
                   bottom: LayoutConstants.paddingL,
                 ),
-                child: SingletonExampleCard(
-                  text: state.currentText,
-                ),
+                child: SingletonExampleCard(text: state.currentText),
               ),
             const SizedBox(height: LayoutConstants.spaceL),
             PlatformButton(

assets/markdown/strategy.md

@@ -255,9 +255,9 @@ class ShippingOptions extends StatelessWidget {
               'Select shipping type:',
               style: Theme.of(context).textTheme.titleMedium,
             ),
-            for (var i = 0; i < shippingOptions.length; i++)
+            for (final (i, option) in shippingOptions.indexed)
               RadioListTile<int>(
-                title: Text(shippingOptions[i].label),
+                title: Text(option.label),
                 value: i,
                 groupValue: selectedIndex,
                 onChanged: onChanged,

lib/design_patterns/bridge/json_helper.dart

@@ -15,8 +15,8 @@ class JsonHelper {
     final json = jsonDecode(jsonString)! as Map<String, dynamic>;
 
     return switch (T) {
-      Customer _ => Customer.fromJson(json) as T,
-      Order _ => Order.fromJson(json) as T,
+      const (Customer) => Customer.fromJson(json) as T,
+      const (Order) => Order.fromJson(json) as T,
       _ => throw Exception("Type of '$T' is not supported."),
     };
   }

lib/design_patterns/builder/burger.dart

@@ -10,7 +10,7 @@ class Burger {
       _ingredients.map((x) => x.getName()).join(', ');
 
   String getFormattedAllergens() => <String>{
-        for (final ingredient in _ingredients) ...ingredient.getAllergens()
+        for (final ingredient in _ingredients) ...ingredient.getAllergens(),
       }.join(', ');
 
   String getFormattedPrice() => '\$${_price.toStringAsFixed(2)}';

lib/design_patterns/builder/ingredients/patties/mc_chicken_patty.dart

@@ -5,7 +5,7 @@ class McChickenPatty extends Ingredient {
     name = 'McChicken Patty';
     allergens = [
       'Wheat',
-      'Cooked in the same fryer that we use for Buttermilk Crispy Chicken which contains a milk allergen'
+      'Cooked in the same fryer that we use for Buttermilk Crispy Chicken which contains a milk allergen',
     ];
   }
 }

lib/modules/main_menu/widgets/main_menu_header.dart

@@ -81,7 +81,7 @@ class MainMenuHeader extends StatelessWidget {
                   ),
                 ],
               ),
-            )
+            ),
           ],
         );
       },

lib/widgets/design_patterns/abstract_factory/factory_selection.dart

@@ -17,9 +17,9 @@ class FactorySelection extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(
       children: <Widget>[
-        for (var i = 0; i < widgetsFactoryList.length; i++)
+        for (final (i, widgetsFactory) in widgetsFactoryList.indexed)
           RadioListTile(
-            title: Text(widgetsFactoryList[i].getTitle()),
+            title: Text(widgetsFactory.getTitle()),
             value: i,
             groupValue: selectedIndex,
             selected: i == selectedIndex,

lib/widgets/design_patterns/adapter/contacts_section.dart

@@ -66,10 +66,7 @@ class _ContactsSectionContent extends StatelessWidget {
           )
         : Column(
             children: <Widget>[
-              for (var contact in contacts)
-                ContactCard(
-                  contact: contact,
-                )
+              for (final contact in contacts) ContactCard(contact: contact),
             ],
           );
   }

lib/widgets/design_patterns/bridge/data_tables/customers_data_table.dart

@@ -34,7 +34,7 @@ class CustomersDatatable extends StatelessWidget {
           ),
         ],
         rows: <DataRow>[
-          for (var customer in customers)
+          for (final customer in customers)
             DataRow(
               cells: <DataCell>[
                 DataCell(Text(customer.name)),

lib/widgets/design_patterns/bridge/data_tables/orders_data_table.dart

@@ -35,7 +35,7 @@ class OrdersDatatable extends StatelessWidget {
           ),
         ],
         rows: <DataRow>[
-          for (var order in orders)
+          for (final order in orders)
             DataRow(
               cells: <DataCell>[
                 DataCell(Text(order.dishes.join(', '))),

lib/widgets/design_patterns/bridge/storage_selection.dart

@@ -17,9 +17,9 @@ class StorageSelection extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(
       children: <Widget>[
-        for (var i = 0; i < storages.length; i++)
+        for (final (i, storage) in storages.indexed)
           RadioListTile(
-            title: Text(storages[i].getTitle()),
+            title: Text(storage.getTitle()),
             value: i,
             groupValue: selectedIndex,
             selected: i == selectedIndex,

lib/widgets/design_patterns/builder/builder_example.dart

@@ -33,7 +33,7 @@ class _BuilderExampleState extends State<BuilderExample> {
       BurgerMenuItem(
         label: 'McChicken\u00AE',
         burgerBuilder: McChickenBuilder(),
-      )
+      ),
     ]);
 
     _selectedBurgerMenuItem = _burgerMenuItems[0];

lib/widgets/design_patterns/chain_of_responsibility/log_messages_column.dart

@@ -14,14 +14,12 @@ class LogMessagesColumn extends StatelessWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
-        for (var logMessage in logMessages)
+        for (final logMessage in logMessages)
           Row(
             children: <Widget>[
-              Expanded(
-                child: logMessage.getFormattedMessage(),
-              ),
+              Expanded(child: logMessage.getFormattedMessage()),
             ],
-          )
+          ),
       ],
     );
   }

lib/widgets/design_patterns/command/command_history_column.dart

@@ -14,14 +14,11 @@ class CommandHistoryColumn extends StatelessWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
-        Text(
-          'Command history:',
-          style: Theme.of(context).textTheme.titleLarge,
-        ),
+        Text('Command history:', style: Theme.of(context).textTheme.titleLarge),
         const SizedBox(height: LayoutConstants.spaceS),
         if (commandList.isEmpty) const Text('Command history is empty.'),
-        for (var i = 0; i < commandList.length; i++)
-          Text('${i + 1}. ${commandList[i]}'),
+        for (final (i, command) in commandList.indexed)
+          Text('${i + 1}. $command'),
       ],
     );
   }

lib/widgets/design_patterns/decorator/pizza_selection.dart

@@ -15,9 +15,9 @@ class PizzaSelection extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(
       children: <Widget>[
-        for (var i = 0; i < _labels.length; i++)
+        for (final (i, label) in _labels.indexed)
           RadioListTile(
-            title: Text(_labels[i]),
+            title: Text(label),
             value: i,
             groupValue: selectedIndex,
             selected: i == selectedIndex,

lib/widgets/design_patterns/factory_method/dialog_selection.dart

@@ -17,9 +17,9 @@ class DialogSelection extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(
       children: <Widget>[
-        for (var i = 0; i < customDialogList.length; i++)
+        for (final (i, dialog) in customDialogList.indexed)
           RadioListTile(
-            title: Text(customDialogList[i].getTitle()),
+            title: Text(dialog.getTitle()),
             value: i,
             groupValue: selectedIndex,
             selected: i == selectedIndex,

lib/widgets/design_patterns/flyweight/flyweight_example.dart

@@ -69,19 +69,14 @@ class _FlyweightExampleState extends State<FlyweightExample> {
   Widget build(BuildContext context) {
     return Stack(
       children: <Widget>[
-        for (var shape in _shapesList)
-          PositionedShapeWrapper(
-            shape: shape,
-          ),
+        for (final shape in _shapesList) PositionedShapeWrapper(shape: shape),
         Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
             SwitchListTile.adaptive(
               title: const Text(
                 'Use flyweight factory',
-                style: TextStyle(
-                  fontWeight: FontWeight.bold,
-                ),
+                style: TextStyle(fontWeight: FontWeight.bold),
               ),
               activeColor: Colors.black,
               value: _useFlyweightFactory,
@@ -92,9 +87,7 @@ class _FlyweightExampleState extends State<FlyweightExample> {
         Center(
           child: Text(
             'Shape instances count: $_shapeInstancesCount',
-            style: const TextStyle(
-              fontWeight: FontWeight.bold,
-            ),
+            style: const TextStyle(fontWeight: FontWeight.bold),
           ),
         ),
       ],

lib/widgets/design_patterns/interpreter/expression_section.dart

@@ -53,11 +53,11 @@ class _ExpressionSectionState extends State<ExpressionSection> {
           secondChild: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
-              for (var solutionStep in _solutionSteps)
+              for (final solutionStep in _solutionSteps)
                 Text(
                   solutionStep,
                   style: Theme.of(context).textTheme.titleSmall,
-                )
+                ),
             ],
           ),
           crossFadeState: _solutionSteps.isEmpty

lib/widgets/design_patterns/interpreter/interpreter_example.dart

@@ -15,7 +15,7 @@ class _InterpreterExampleState extends State<InterpreterExample> {
     '20 3 5 * - 2 3 * +',
     '1 1 1 1 1 + + + * 2 -',
     '123 12 1 - - 12 9 * -',
-    '9 8 7 6 5 4 3 2 1 + - + - + - + -'
+    '9 8 7 6 5 4 3 2 1 + - + - + - + -',
   ];
 
   @override
@@ -29,10 +29,8 @@ class _InterpreterExampleState extends State<InterpreterExample> {
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
-            for (var postfixExpression in _postfixExpressions)
-              ExpressionSection(
-                postfixExpression: postfixExpression,
-              ),
+            for (final postfixExpression in _postfixExpressions)
+              ExpressionSection(postfixExpression: postfixExpression),
           ],
         ),
       ),