.gitlab-ci.yml

 image: ghcr.io/cirruslabs/flutter:latest
 
 stages:
-  - update
   - build-debug
   - build-release
   - release
   - deploy
 
-update:
-  stage: update
-  except:
-    - tags
-  script:
-    - flutter packages get
-    - flutter packages upgrade
-  interruptible: true
-
 android:build-debug:
   stage: build-debug
   except:
     - tags
+    - master
   script:
     # Flutter local configuration
     - echo flutter.sdk=$FLUTTER_PATH > android/local.properties
@@ -49,8 +40,6 @@ android:build-release:
     - master
   except:
     - tags
-  dependencies:
-    - android:build-debug
   script:
     # Flutter local configuration
     - echo flutter.sdk=$FLUTTER_PATH > android/local.properties
@@ -121,4 +110,4 @@ android:deploy:
   dependencies:
     - application:release
   script:
-    - curl "${REPOSITORY_UPDATE_WEBHOOK}?token=${REPOSITORY_TOKEN}"
+    - curl "${REPOSITORY_UPDATE_WEBHOOK}?token=${REPOSITORY_TOKEN}" --fail

analysis_options.yaml

+include: package:flutter_lints/flutter.yaml

android/app/build.gradle

+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -14,11 +20,6 @@ if (gradlePropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def appVersionCode = gradleProperties.getProperty('app.versionCode')
 if (appVersionCode == null) {
     appVersionCode = '1'
@@ -29,9 +30,6 @@ if (appVersionName == null) {
     appVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
@@ -44,7 +42,7 @@ android {
 
     defaultConfig {
         applicationId "org.benoitharrault.sudoku"
-        minSdkVersion 16
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion 30
         versionCode appVersionCode.toInteger()
         versionName appVersionName

android/build.gradle

-buildscript {
-    repositories {
-        google()
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
-    }
-}
-
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

android/gradle.properties

 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-app.versionName=0.1.12
-app.versionCode=61
+app.versionName=0.1.16
+app.versionCode=65

android/settings.gradle

-include ':app'
-
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
+pluginManagement {
+    def flutterSdkPath = {
         def properties = new Properties()
-
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
-
+        file("local.properties").withInputStream { properties.load(it) }
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
+
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.2.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.22" apply false
+}
+
+include ":app"

fastlane/metadata/android/en-US/changelogs/62.txt

+Add automatic flutter linter. Apply code lints. Update dependencies.

fastlane/metadata/android/en-US/changelogs/63.txt

+Update flutter gradle plugin.

fastlane/metadata/android/en-US/changelogs/64.txt

+Avoid print calls in production code.

fastlane/metadata/android/en-US/changelogs/65.txt

+Improve CI/CD, remove "update" step, disable "build-debug" in master branch.

fastlane/metadata/android/fr-FR/changelogs/62.txt

+Ajout d'un correcteur automatique de code. Application des corrections. Mise à jour des dépendances.

fastlane/metadata/android/fr-FR/changelogs/63.txt

+Mise à jour du plugin gradle pour flutter.

fastlane/metadata/android/fr-FR/changelogs/64.txt

+Supprime les appels à print dans le code de production.

fastlane/metadata/android/fr-FR/changelogs/65.txt

+Amélioration de la CI/CD. Suppression de "update" et désactivation de "build-debug" sur master.

generator/generate.py

@@ -5,15 +5,15 @@ import sys
 from random import randint, shuffle
 
 if (len(sys.argv) != 3):
-    print('Usage: generate.py block-size difficulty')
-    print('block-size: [2x2|3x2|3x3|4x4]')
-    print('difficulty: [easy|medium|hard|nightmare]')
+    printlog('Usage: generate.py block-size difficulty')
+    printlog('block-size: [2x2|3x2|3x3|4x4]')
+    printlog('difficulty: [easy|medium|hard|nightmare]')
     exit()
 
 blocksize, difficulty = sys.argv[1], sys.argv[2]
 
 if blocksize not in ['2x2', '3x2', '3x3', '4x4']:
-    print('wrong size given')
+    printlog('wrong size given')
     exit()
 
 splitted_blocksize = blocksize.split('x')
@@ -23,7 +23,7 @@ size_vertical = int(splitted_blocksize[1])
 boardSize = size_horizontal * size_vertical
 
 if difficulty not in ['easy', 'medium', 'hard', 'nightmare']:
-    print('wrong difficulty given')
+    printlog('wrong difficulty given')
     exit()
 
 debugFillGrid = False

generator/solve.py

@@ -14,14 +14,14 @@
 import sys
 
 if (len(sys.argv) != 3):
-    print('Usage: solve.py block-size grid')
-    print('block-size: [2x2|3x2|3x3|4x4]')
+    printlog('Usage: solve.py block-size grid')
+    printlog('block-size: [2x2|3x2|3x3|4x4]')
     exit()
 
 blocksize, gridTemplate = sys.argv[1], sys.argv[2]
 
 if blocksize not in ['2x2', '3x2', '3x3', '4x4']:
-    print('wrong size given')
+    printlog('wrong size given')
     exit()
 
 splitted_blocksize = blocksize.split('x')
@@ -31,7 +31,7 @@ size_vertical = int(splitted_blocksize[1])
 boardSize = size_horizontal * size_vertical
 
 if (len(gridTemplate) != boardSize * boardSize):
-    print('wrong grid length (should be ' + str(boardSize * boardSize) + ')')
+    printlog('wrong grid length (should be ' + str(boardSize * boardSize) + ')')
     exit()
 
 debugSolveGrid = False
@@ -112,7 +112,7 @@ def hasConflict(grid, size_horizontal, size_vertical):
             if value != 0:
                 values.append(value)
         if containsDuplicates(values):
-            # print('Horizontal conflict found')
+            # printlog('Horizontal conflict found')
             return True
 
     # Check vertical conflicts
@@ -123,7 +123,7 @@ def hasConflict(grid, size_horizontal, size_vertical):
             if value != 0:
                 values.append(value)
         if containsDuplicates(values):
-            # print('Vertical conflict found')
+            # printlog('Vertical conflict found')
             return True
 
     # Check sub-blocks conflicts
@@ -139,7 +139,7 @@ def hasConflict(grid, size_horizontal, size_vertical):
                     if value != 0:
                         values.append(value)
             if containsDuplicates(values):
-                # print('Sub-block conflict found')
+                # printlog('Sub-block conflict found')
                 return True
 
     return False
@@ -176,18 +176,18 @@ def solve(grid, size_horizontal, size_vertical):
             break
 
         if debugSolveGrid:
-            print('===================================')
-            print('Iteration: ' + str(iterations))
+            printlog('===================================')
+            printlog('Iteration: ' + str(iterations))
 
         # Get first/next cell with only one allowed value
         candidates = []
         if debugSolveGrid:
-            print('Searching for empty cells...')
+            printlog('Searching for empty cells...')
         for row in range(len(grid)):
             for col in range(len(grid[row])):
                 if grid[row][col] == 0:
                     if debugSolveGrid:
-                        print(
+                        printlog(
                             'Found empty cell [' + str(col) + ',' + str(row) + ']')
                     candidates.append([row, col])
 
@@ -198,16 +198,16 @@ def solve(grid, size_horizontal, size_vertical):
                 allowedValues = findAllowedValuesForCell(
                     grid, size_horizontal, size_vertical, candidateRow, candidateCol)
                 if debugSolveGrid:
-                    print('Allowed values for cell [' + str(candidateCol) + ',' + str(
+                    printlog('Allowed values for cell [' + str(candidateCol) + ',' + str(
                         candidateRow) + ']: ' + str(allowedValues))
                 if len(allowedValues) != 1:
                     if debugSolveGrid:
-                        print(' Non unique allowed value for cell. Skip to next cell')
+                        printlog(' Non unique allowed value for cell. Skip to next cell')
                 else:
                     value = allowedValues[0]
                     grid[candidateRow][candidateCol] = value
                     if debugSolveGrid:
-                        print(' Found unique allowed value for cell [' + str(
+                        printlog(' Found unique allowed value for cell [' + str(
                             candidateCol) + ',' + str(candidateRow) + ']: ' + str(value))
                         drawGrid(grid)
 

lib/entities/cell.dart

 import 'package:flutter/material.dart';
 
-import '../provider/data.dart';
-import '../utils/board_animate.dart';
-import '../utils/board_utils.dart';
+import 'package:sudoku/provider/data.dart';
+import 'package:sudoku/utils/board_animate.dart';
+import 'package:sudoku/utils/board_utils.dart';
 
 class Cell {
   int value;
@@ -20,18 +20,18 @@ class Cell {
   * Build widget for board cell, with interactions
   */
   Container widget(Data myProvider, int row, int col) {
-    String imageAsset = this.getImageAssetName(myProvider);
+    final String imageAsset = getImageAssetName(myProvider);
 
     return Container(
       decoration: BoxDecoration(
-        color: this.getBackgroundColor(myProvider),
-        border: this.getCellBorders(myProvider, row, col),
+        color: getBackgroundColor(myProvider),
+        border: getCellBorders(myProvider, row, col),
       ),
       child: GestureDetector(
         child: AnimatedSwitcher(
           duration: const Duration(milliseconds: 100),
           transitionBuilder: (Widget child, Animation<double> animation) {
-            return ScaleTransition(child: child, scale: animation);
+            return ScaleTransition(scale: animation, child: child);
           },
           child: Image(
             image: AssetImage(imageAsset),
@@ -54,22 +54,22 @@ class Cell {
   * Build widget for select/update value cell, with interactions
   */
   Container widgetUpdateValue(Data myProvider) {
-    if (this.value < 0) {
+    if (value < 0) {
       return Container();
     }
 
-    String imageAsset = this.getImageAssetName(myProvider);
+    final String imageAsset = getImageAssetName(myProvider);
     Color backgroundColor = Colors.grey.shade200;
 
     if (myProvider.showConflicts &&
         myProvider.currentCellCol != null &&
         myProvider.currentCellRow != null) {
-      List cells = myProvider.cells;
-      int blockSizeHorizontal = myProvider.blockSizeHorizontal;
-      int blockSizeVertical = myProvider.blockSizeVertical;
+      final List<List<Cell>> cells = myProvider.cells;
+      final int blockSizeHorizontal = myProvider.blockSizeHorizontal;
+      final int blockSizeVertical = myProvider.blockSizeVertical;
 
       if (!BoardUtils.isValueAllowed(cells, blockSizeHorizontal, blockSizeVertical,
-          myProvider.currentCellCol, myProvider.currentCellRow, this.value)) {
+          myProvider.currentCellCol, myProvider.currentCellRow, value)) {
         backgroundColor = Colors.pink.shade100;
       }
     }
@@ -87,7 +87,7 @@ class Cell {
           onTap: () {
             if (myProvider.currentCellCol != null && myProvider.currentCellRow != null) {
               myProvider.updateCellValue(
-                  myProvider.currentCellCol, myProvider.currentCellRow, this.value);
+                  myProvider.currentCellCol, myProvider.currentCellRow, value);
             }
             myProvider.selectCell(null, null);
             if (BoardUtils.checkBoardIsSolved(myProvider)) {
@@ -101,51 +101,49 @@ class Cell {
   * Compute image asset name, from skin and cell value/state
   */
   String getImageAssetName(Data myProvider) {
-    String imageAsset = 'assets/icons/cell_empty.png';
-    if (this.value > 0) {
-      int cellValue = myProvider.getTranslatedValueForDisplay(this.value);
-      imageAsset =
-          'assets/skins/' + myProvider.parameterSkin + '_' + cellValue.toString() + '.png';
+    if (value > 0) {
+      int cellValue = myProvider.getTranslatedValueForDisplay(value);
+      return 'assets/skins/${myProvider.parameterSkin}_$cellValue.png';
     }
 
-    return imageAsset;
+    return 'assets/icons/cell_empty.png';
   }
 
   // Compute cell background color, from cell state
   Color getBackgroundColor(Data myProvider) {
-    Color editableCellColor = Colors.grey.shade100;
-    Color editableCellColorConflict = Colors.pink.shade100;
-    Color fixedCellColor = Colors.grey.shade300;
-    Color fixedCellColorConflict = Colors.pink.shade200;
-    Color editableSelectedValueColor = Colors.green.shade100;
-    Color fixedSelectedValueColor = Colors.green.shade300;
-    Color editableAnimated = Colors.green.shade200;
-    Color fixedAnimated = Colors.green.shade300;
+    final Color editableCellColor = Colors.grey.shade100;
+    final Color editableCellColorConflict = Colors.pink.shade100;
+    final Color fixedCellColor = Colors.grey.shade300;
+    final Color fixedCellColorConflict = Colors.pink.shade200;
+    final Color editableSelectedValueColor = Colors.green.shade100;
+    final Color fixedSelectedValueColor = Colors.green.shade300;
+    final Color editableAnimated = Colors.green.shade200;
+    final Color fixedAnimated = Colors.green.shade300;
 
     Color backgroundColor = editableCellColor;
 
-    if (this.isFixed) {
+    if (isFixed) {
       backgroundColor = fixedCellColor;
     }
 
-    if (myProvider.showConflicts && (this.conflictsCount != 0)) {
-      if (this.isFixed) {
+    if (myProvider.showConflicts && (conflictsCount != 0)) {
+      if (isFixed) {
         backgroundColor = fixedCellColorConflict;
       } else {
         backgroundColor = editableCellColorConflict;
       }
     }
 
-    if (myProvider.showConflicts && (this.value == myProvider.currentCellValue)) {
-      if (this.isFixed) {
+    if (myProvider.showConflicts && (value == myProvider.currentCellValue)) {
+      if (isFixed) {
         backgroundColor = fixedSelectedValueColor;
       } else {
         backgroundColor = editableSelectedValueColor;
       }
     }
 
-    if (this.isAnimated) {
-      if (this.isFixed) {
+    if (isAnimated) {
+      if (isFixed) {
         backgroundColor = fixedAnimated;
       } else {
         backgroundColor = editableAnimated;
@@ -157,18 +155,18 @@ class Cell {
 
   // Compute cell borders, from board size and cell state
   Border getCellBorders(Data myProvider, int row, int col) {
-    int blockSizeHorizontal = myProvider.blockSizeHorizontal;
-    int blockSizeVertical = myProvider.blockSizeVertical;
+    final int blockSizeHorizontal = myProvider.blockSizeHorizontal;
+    final int blockSizeVertical = myProvider.blockSizeVertical;
 
-    Color cellBorderDarkColor = Colors.black;
-    Color cellBorderLightColor = Colors.grey;
-    Color cellBorderSelectedColor = Colors.red;
+    const Color cellBorderDarkColor = Colors.black;
+    const Color cellBorderLightColor = Colors.grey;
+    const Color cellBorderSelectedColor = Colors.red;
 
     Color cellBorderColor = cellBorderSelectedColor;
     double cellBorderWidth = 4;
 
     // Reduce cell border width on big boards
-    int boardSize = blockSizeVertical * blockSizeHorizontal;
+    final int boardSize = blockSizeVertical * blockSizeHorizontal;
     if (boardSize > 8) {
       cellBorderWidth = 2;
       if (boardSize > 10) {

lib/layout/board.dart

 import 'package:flutter/material.dart';
 
-import '../provider/data.dart';
+import 'package:sudoku/entities/cell.dart';
+import 'package:sudoku/provider/data.dart';
 
 class Board {
   static Container buildGameBoard(Data myProvider) {
-    Color borderColor = Colors.black;
+    const Color borderColor = Colors.black;
 
     return Container(
-      margin: EdgeInsets.all(2),
-      padding: EdgeInsets.all(2),
+      margin: const EdgeInsets.all(2),
+      padding: const EdgeInsets.all(2),
       decoration: BoxDecoration(
         color: borderColor,
         borderRadius: BorderRadius.circular(2),
@@ -25,14 +26,14 @@ class Board {
     );
   }
 
-  static Table buildGameTileset(Data myProvider) {
-    int boardSize = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical;
-    List cells = myProvider.cells;
+  static Widget buildGameTileset(Data myProvider) {
+    final int boardSize = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical;
+    final List<List<Cell>> cells = myProvider.cells;
 
-    return Table(defaultColumnWidth: IntrinsicColumnWidth(), children: [
-      for (var row = 0; row < boardSize; row++)
+    return Table(defaultColumnWidth: const IntrinsicColumnWidth(), children: [
+      for (int row = 0; row < boardSize; row++)
         TableRow(children: [
-          for (var col = 0; col < boardSize; col++)
+          for (int col = 0; col < boardSize; col++)
             Column(children: [cells[row][col].widget(myProvider, row, col)]),
         ]),
     ]);

lib/layout/game.dart

@@ -2,55 +2,53 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 
-import '../entities/cell.dart';
-import '../layout/board.dart';
-import '../provider/data.dart';
-import '../utils/board_utils.dart';
-import '../utils/game_utils.dart';
+import 'package:sudoku/entities/cell.dart';
+import 'package:sudoku/layout/board.dart';
+import 'package:sudoku/provider/data.dart';
+import 'package:sudoku/utils/board_utils.dart';
+import 'package:sudoku/utils/game_utils.dart';
 
 class Game {
-  static Container buildGameWidget(Data myProvider) {
-    bool gameIsFinished = BoardUtils.checkBoardIsSolved(myProvider);
+  static Widget buildGameWidget(Data myProvider) {
+    final bool gameIsFinished = BoardUtils.checkBoardIsSolved(myProvider);
 
-    return Container(
-      child: Column(
+    return Column(
       mainAxisAlignment: MainAxisAlignment.start,
       crossAxisAlignment: CrossAxisAlignment.center,
       children: [
         Board.buildGameBoard(myProvider),
-          SizedBox(height: 2),
+        const SizedBox(height: 2),
         gameIsFinished
             ? Game.buildEndGameMessage(myProvider)
             : Game.buildSelectCellValueBar(myProvider),
       ],
-      ),
     );
   }
 
   static Container buildSelectCellValueBar(Data myProvider) {
-    List cells = myProvider.cells;
+    final List<List<Cell>> cells = myProvider.cells;
 
-    bool isCellSelected =
+    final bool isCellSelected =
         (myProvider.currentCellCol != null && myProvider.currentCellRow != null);
-    bool isUpdatableCellSelected = isCellSelected
+    final bool isUpdatableCellSelected = isCellSelected
         ? !cells[myProvider.currentCellRow ?? 0][myProvider.currentCellCol ?? 0].isFixed
         : false;
-    int maxValue = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical;
+    final int maxValue = myProvider.blockSizeHorizontal * myProvider.blockSizeVertical;
 
-    int maxItemsPerLine = 10;
-    int linesCount = (maxValue / maxItemsPerLine).floor() + 1;
-    int itemsCountPerLine = min(maxItemsPerLine, maxValue + 1);
+    const int maxItemsPerLine = 10;
+    final int linesCount = (maxValue / maxItemsPerLine).floor() + 1;
+    final int itemsCountPerLine = min(maxItemsPerLine, maxValue + 1);
 
     return Container(
-      margin: EdgeInsets.all(2),
-      padding: EdgeInsets.all(2),
+      margin: const EdgeInsets.all(2),
+      padding: const EdgeInsets.all(2),
       child: Table(
-        defaultColumnWidth: IntrinsicColumnWidth(),
+        defaultColumnWidth: const IntrinsicColumnWidth(),
         children: [
-          for (var lineIndex = 0; lineIndex < linesCount; lineIndex++)
+          for (int lineIndex = 0; lineIndex < linesCount; lineIndex++)
             TableRow(
               children: [
-                for (var value = lineIndex * itemsCountPerLine;
+                for (int value = lineIndex * itemsCountPerLine;
                     value < (lineIndex + 1) * itemsCountPerLine;
                     value++)
                   Column(
@@ -67,33 +65,31 @@ class Game {
     );
   }
 
-  static TextButton buildRestartGameButton(Data myProvider) {
+  static Widget buildRestartGameButton(Data myProvider) {
     return TextButton(
-      child: Container(
-        child: Image(
+      child: const Image(
         image: AssetImage('assets/icons/button_back.png'),
         fit: BoxFit.fill,
       ),
-      ),
       onPressed: () => GameUtils.quitGame(myProvider),
     );
   }
 
   static Container buildEndGameMessage(Data myProvider) {
-    Image decorationImage = Image(
+    const Image decorationImage = Image(
       image: AssetImage('assets/icons/game_win.png'),
       fit: BoxFit.fill,
     );
 
     return Container(
-      margin: EdgeInsets.all(2),
-      padding: EdgeInsets.all(2),
+      margin: const EdgeInsets.all(2),
+      padding: const EdgeInsets.all(2),
       child: Table(
-        defaultColumnWidth: IntrinsicColumnWidth(),
+        defaultColumnWidth: const IntrinsicColumnWidth(),
         children: [
           TableRow(
             children: [
-              Column(
+              const Column(
                 children: [decorationImage],
               ),
               Column(
@@ -103,7 +99,7 @@ class Game {
                       : buildRestartGameButton(myProvider)
                 ],
               ),
-              Column(
+              const Column(
                 children: [decorationImage],
               ),
             ],

lib/layout/parameters.dart

 import 'package:flutter/material.dart';
 
-import '../provider/data.dart';
-import '../utils/game_utils.dart';
+import 'package:sudoku/provider/data.dart';
+import 'package:sudoku/utils/game_utils.dart';
 
 class Parameters {
-  static double separatorHeight = 2.0;
-  static double blockMargin = 3.0;
-  static double blockPadding = 2.0;
-  static Color buttonBackgroundColor = Colors.white;
-  static Color buttonBorderColorActive = Colors.blue;
-  static Color buttonBorderColorInactive = Colors.white;
-  static double buttonBorderWidth = 10.0;
-  static double buttonBorderRadius = 8.0;
-  static double buttonPadding = 0.0;
-  static double buttonMargin = 0.0;
-
-  static Container buildParametersSelector(Data myProvider) {
+  static const double separatorHeight = 2.0;
+  static const double blockMargin = 3.0;
+  static const double blockPadding = 2.0;
+  static const Color buttonBackgroundColor = Colors.white;
+  static const Color buttonBorderColorActive = Colors.blue;
+  static const Color buttonBorderColorInactive = Colors.white;
+  static const double buttonBorderWidth = 10.0;
+  static const double buttonBorderRadius = 8.0;
+  static const double buttonPadding = 0.0;
+  static const double buttonMargin = 0.0;
+
+  static Widget buildParametersSelector(Data myProvider) {
     List<Widget> lines = [];
 
-    List parameters = myProvider.availableParameters;
-    for (var index = 0; index < parameters.length; index++) {
+    List<String> parameters = myProvider.availableParameters;
+    for (int index = 0; index < parameters.length; index++) {
       lines.add(buildParameterSelector(myProvider, parameters[index]));
-      lines.add(SizedBox(height: separatorHeight));
+      lines.add(const SizedBox(height: separatorHeight));
     }
 
     myProvider.loadCurrentSavedState();
@@ -29,12 +29,11 @@ class Parameters {
         ? buildResumeGameButton(myProvider)
         : buildStartNewGameButton(myProvider);
 
-    return Container(
-      child: Column(
+    return Column(
       mainAxisAlignment: MainAxisAlignment.start,
       crossAxisAlignment: CrossAxisAlignment.center,
       children: [
-          SizedBox(height: separatorHeight),
+        const SizedBox(height: separatorHeight),
         Expanded(
           child: Column(
             mainAxisSize: MainAxisSize.min,
@@ -42,18 +41,17 @@ class Parameters {
             children: lines,
           ),
         ),
-          SizedBox(height: separatorHeight),
+        const SizedBox(height: separatorHeight),
         Container(
           child: buttonsBlock,
         ),
       ],
-      ),
     );
   }
 
   static Image buildImageWidget(String imageAssetCode) {
     return Image(
-      image: AssetImage('assets/icons/' + imageAssetCode + '.png'),
+      image: AssetImage('assets/icons/$imageAssetCode.png'),
       fit: BoxFit.fill,
     );
   }
@@ -69,7 +67,7 @@ class Parameters {
       children: [
         TextButton(
           child: buildImageContainerWidget('placeholder'),
-          onPressed: () => null,
+          onPressed: () {},
         ),
       ],
     );
@@ -77,10 +75,10 @@ class Parameters {
 
   static Container buildStartNewGameButton(Data myProvider) {
     return Container(
-      margin: EdgeInsets.all(blockMargin),
-      padding: EdgeInsets.all(blockPadding),
+      margin: const EdgeInsets.all(blockMargin),
+      padding: const EdgeInsets.all(blockPadding),
       child: Table(
-        defaultColumnWidth: IntrinsicColumnWidth(),
+        defaultColumnWidth: const IntrinsicColumnWidth(),
         children: [
           TableRow(
             children: [
@@ -103,10 +101,10 @@ class Parameters {
 
   static Container buildResumeGameButton(Data myProvider) {
     return Container(
-      margin: EdgeInsets.all(blockMargin),
-      padding: EdgeInsets.all(blockPadding),
+      margin: const EdgeInsets.all(blockMargin),
+      padding: const EdgeInsets.all(blockPadding),
       child: Table(
-        defaultColumnWidth: IntrinsicColumnWidth(),
+        defaultColumnWidth: const IntrinsicColumnWidth(),
         children: [
           TableRow(
             children: [
@@ -135,18 +133,18 @@ class Parameters {
   }
 
   static Widget buildParameterSelector(Data myProvider, String parameterCode) {
-    List availableValues = myProvider.getParameterAvailableValues(parameterCode);
+    List<String> availableValues = myProvider.getParameterAvailableValues(parameterCode);
 
     if (availableValues.length == 1) {
-      return SizedBox(height: 0.0);
+      return const SizedBox(height: 0.0);
     }
 
     return Table(
-      defaultColumnWidth: IntrinsicColumnWidth(),
+      defaultColumnWidth: const IntrinsicColumnWidth(),
       children: [
         TableRow(
           children: [
-            for (var index = 0; index < availableValues.length; index++)
+            for (int index = 0; index < availableValues.length; index++)
               Column(
                 children: [
                   _buildParameterButton(myProvider, parameterCode, availableValues[index])
@@ -163,12 +161,12 @@ class Parameters {
     String currentValue = myProvider.getParameterValue(parameterCode).toString();
 
     bool isActive = (parameterValue == currentValue);
-    String imageAsset = parameterCode + '_' + parameterValue;
+    String imageAsset = '${parameterCode}_$parameterValue';
 
     return TextButton(
       child: Container(
-        margin: EdgeInsets.all(buttonMargin),
-        padding: EdgeInsets.all(buttonPadding),
+        margin: const EdgeInsets.all(buttonMargin),
+        padding: const EdgeInsets.all(buttonPadding),
         decoration: BoxDecoration(
           color: buttonBackgroundColor,
           borderRadius: BorderRadius.circular(buttonBorderRadius),