Skip to content
Snippets Groups Projects
Commit c90ea609 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '33-use-flutter-linter-and-apply-lints' into 'master'

Resolve "Use flutter linter and apply lints"

Closes #33

See merge request !28
parents be56bc92 fc925be9
No related branches found
No related tags found
1 merge request!28Resolve "Use flutter linter and apply lints"
Pipeline #5121 canceled
...@@ -57,7 +57,7 @@ class GameTopIndicatorWidget extends StatelessWidget { ...@@ -57,7 +57,7 @@ class GameTopIndicatorWidget extends StatelessWidget {
), ),
), ),
TextButton( TextButton(
child: Icon(UniconsSolid.refresh), child: const Icon(UniconsSolid.refresh),
onPressed: () { onPressed: () {
final GameCubit gameCubit = BlocProvider.of<GameCubit>(context); final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
gameCubit.shuffleColors(currentGame.globalSettings.colorsTheme); gameCubit.shuffleColors(currentGame.globalSettings.colorsTheme);
......
...@@ -18,13 +18,11 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget { ...@@ -18,13 +18,11 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
if (currentGame.isRunning) { if (currentGame.isRunning) {
menuActions.add(TextButton( menuActions.add(TextButton(
child: Container( child: const Image(
child: Image(
image: AssetImage('assets/icons/button_back.png'), image: AssetImage('assets/icons/button_back.png'),
fit: BoxFit.fill, fit: BoxFit.fill,
), ),
), onPressed: () {},
onPressed: () => null,
onLongPress: () { onLongPress: () {
final GameCubit gameCubit = BlocProvider.of<GameCubit>(context); final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
gameCubit.quitGame(); gameCubit.quitGame();
......
...@@ -23,7 +23,7 @@ class Parameters extends StatelessWidget { ...@@ -23,7 +23,7 @@ class Parameters extends StatelessWidget {
? DefaultGlobalSettings.getAvailableValues(code) ? DefaultGlobalSettings.getAvailableValues(code)
: DefaultGameSettings.getAvailableValues(code); : DefaultGameSettings.getAvailableValues(code);
availableValues.forEach((value) { for (int value in availableValues) {
final Widget parameterButton = BlocBuilder<GameSettingsCubit, GameSettingsState>( final Widget parameterButton = BlocBuilder<GameSettingsCubit, GameSettingsState>(
builder: (BuildContext context, GameSettingsState gameSettingsState) { builder: (BuildContext context, GameSettingsState gameSettingsState) {
return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>( return BlocBuilder<GlobalSettingsCubit, GlobalSettingsState>(
...@@ -44,8 +44,8 @@ class Parameters extends StatelessWidget { ...@@ -44,8 +44,8 @@ class Parameters extends StatelessWidget {
return TextButton( return TextButton(
child: Container( child: Container(
margin: EdgeInsets.all(0), margin: const EdgeInsets.all(0),
padding: EdgeInsets.all(0), padding: const EdgeInsets.all(0),
child: CustomPaint( child: CustomPaint(
size: Size(itemWidth, itemWidth), size: Size(itemWidth, itemWidth),
willChange: false, willChange: false,
...@@ -69,7 +69,7 @@ class Parameters extends StatelessWidget { ...@@ -69,7 +69,7 @@ class Parameters extends StatelessWidget {
); );
parameterButtons.add(parameterButton); parameterButtons.add(parameterButton);
}); }
return parameterButtons; return parameterButtons;
} }
...@@ -79,7 +79,7 @@ class Parameters extends StatelessWidget { ...@@ -79,7 +79,7 @@ class Parameters extends StatelessWidget {
final List<Widget> lines = []; final List<Widget> lines = [];
// Game settings // Game settings
DefaultGameSettings.availableParameters.forEach((code) { for (String code in DefaultGameSettings.availableParameters) {
lines.add(Row( lines.add(Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: buildParametersLine( children: buildParametersLine(
...@@ -89,14 +89,14 @@ class Parameters extends StatelessWidget { ...@@ -89,14 +89,14 @@ class Parameters extends StatelessWidget {
)); ));
lines.add(SizedBox(height: separatorHeight)); lines.add(SizedBox(height: separatorHeight));
}); }
lines.add(SizedBox(height: separatorHeight)); lines.add(SizedBox(height: separatorHeight));
lines.add(buildStartNewGameButton()); lines.add(buildStartNewGameButton());
lines.add(SizedBox(height: separatorHeight)); lines.add(SizedBox(height: separatorHeight));
// Global settings // Global settings
DefaultGlobalSettings.availableParameters.forEach((code) { for (String code in DefaultGlobalSettings.availableParameters) {
lines.add(Row( lines.add(Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: buildParametersLine( children: buildParametersLine(
...@@ -106,7 +106,7 @@ class Parameters extends StatelessWidget { ...@@ -106,7 +106,7 @@ class Parameters extends StatelessWidget {
)); ));
lines.add(SizedBox(height: separatorHeight)); lines.add(SizedBox(height: separatorHeight));
}); }
return Column( return Column(
children: lines, children: lines,
...@@ -115,7 +115,7 @@ class Parameters extends StatelessWidget { ...@@ -115,7 +115,7 @@ class Parameters extends StatelessWidget {
static Image buildImageWidget(String imageAssetCode) { static Image buildImageWidget(String imageAssetCode) {
return Image( return Image(
image: AssetImage('assets/icons/' + imageAssetCode + '.png'), image: AssetImage('assets/icons/$imageAssetCode.png'),
fit: BoxFit.fill, fit: BoxFit.fill,
); );
} }
...@@ -131,7 +131,7 @@ class Parameters extends StatelessWidget { ...@@ -131,7 +131,7 @@ class Parameters extends StatelessWidget {
children: [ children: [
TextButton( TextButton(
child: buildImageContainerWidget('placeholder'), child: buildImageContainerWidget('placeholder'),
onPressed: () => null, onPressed: () {},
), ),
], ],
); );
...@@ -148,10 +148,10 @@ class Parameters extends StatelessWidget { ...@@ -148,10 +148,10 @@ class Parameters extends StatelessWidget {
final GameCubit gameCubit = BlocProvider.of<GameCubit>(context); final GameCubit gameCubit = BlocProvider.of<GameCubit>(context);
return Container( return Container(
margin: EdgeInsets.all(blockMargin), margin: const EdgeInsets.all(blockMargin),
padding: EdgeInsets.all(blockPadding), padding: const EdgeInsets.all(blockPadding),
child: Table( child: Table(
defaultColumnWidth: IntrinsicColumnWidth(), defaultColumnWidth: const IntrinsicColumnWidth(),
children: [ children: [
TableRow( TableRow(
children: [ children: [
......
...@@ -13,10 +13,10 @@ packages: ...@@ -13,10 +13,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: bloc name: bloc
sha256: "3820f15f502372d979121de1f6b97bfcf1630ebff8fe1d52fb2b0bfa49be5b49" sha256: f53a110e3b48dcd78136c10daa5d51512443cea5e1348c9d80a320095fa2db9e
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "8.1.2" version: "8.1.3"
characters: characters:
dependency: transitive dependency: transitive
description: description:
...@@ -53,10 +53,10 @@ packages: ...@@ -53,10 +53,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: easy_localization name: easy_localization
sha256: de63e3b422adfc97f256cbb3f8cf12739b6a4993d390f3cadb3f51837afaefe5 sha256: "9c86754b22aaa3e74e471635b25b33729f958dd6fb83df0ad6612948a7b231af"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.3" version: "3.0.4"
easy_logger: easy_logger:
dependency: transitive dependency: transitive
description: description:
...@@ -77,10 +77,10 @@ packages: ...@@ -77,10 +77,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: ffi name: ffi
sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.0" version: "2.1.2"
file: file:
dependency: transitive dependency: transitive
description: description:
...@@ -98,10 +98,18 @@ packages: ...@@ -98,10 +98,18 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_bloc name: flutter_bloc
sha256: e74efb89ee6945bcbce74a5b3a5a3376b088e5f21f55c263fc38cbdc6237faae sha256: "87325da1ac757fcc4813e6b34ed5dd61169973871fdf181d6c2109dd6935ece1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "8.1.3" version: "8.1.4"
flutter_lints:
dependency: "direct dev"
description:
name: flutter_lints
sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
url: "https://pub.dev"
source: hosted
version: "3.0.1"
flutter_localizations: flutter_localizations:
dependency: transitive dependency: transitive
description: flutter description: flutter
...@@ -113,7 +121,7 @@ packages: ...@@ -113,7 +121,7 @@ packages:
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
hive: hive:
dependency: transitive dependency: "direct main"
description: description:
name: hive name: hive
sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941" sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941"
...@@ -124,10 +132,10 @@ packages: ...@@ -124,10 +132,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: hydrated_bloc name: hydrated_bloc
sha256: c925e49704c052a8f249226ae7603f86bfa776b910816390763b956c71d2cbaf sha256: "00a2099680162e74b5a836b8a7f446e478520a9cae9f6032e028ad8129f4432d"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "9.1.3" version: "9.1.4"
intl: intl:
dependency: transitive dependency: transitive
description: description:
...@@ -136,22 +144,30 @@ packages: ...@@ -136,22 +144,30 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.18.1" version: "0.18.1"
lints:
dependency: transitive
description:
name: lints
sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
url: "https://pub.dev"
source: hosted
version: "3.0.0"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.5.0" version: "0.8.0"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.10.0" version: "1.11.0"
nested: nested:
dependency: transitive dependency: transitive
description: description:
...@@ -164,10 +180,10 @@ packages: ...@@ -164,10 +180,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: path name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.8.3" version: "1.9.0"
path_provider: path_provider:
dependency: "direct main" dependency: "direct main"
description: description:
...@@ -337,10 +353,10 @@ packages: ...@@ -337,10 +353,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: web name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.3.0" version: "0.4.2"
win32: win32:
dependency: transitive dependency: transitive
description: description:
...@@ -358,5 +374,5 @@ packages: ...@@ -358,5 +374,5 @@ packages:
source: hosted source: hosted
version: "1.0.4" version: "1.0.4"
sdks: sdks:
dart: ">=3.2.0 <4.0.0" dart: ">=3.3.0-279.1.beta <4.0.0"
flutter: ">=3.16.0" flutter: ">=3.16.0"
...@@ -3,7 +3,7 @@ description: Jeweled Game ...@@ -3,7 +3,7 @@ description: Jeweled Game
publish_to: 'none' publish_to: 'none'
version: 0.0.24+24 version: 0.0.25+25
environment: environment:
sdk: '^3.0.0' sdk: '^3.0.0'
...@@ -14,10 +14,14 @@ dependencies: ...@@ -14,10 +14,14 @@ dependencies:
easy_localization: ^3.0.1 easy_localization: ^3.0.1
equatable: ^2.0.5 equatable: ^2.0.5
flutter_bloc: ^8.1.1 flutter_bloc: ^8.1.1
hive: ^2.2.3
hydrated_bloc: ^9.0.0 hydrated_bloc: ^9.0.0
path_provider: ^2.0.11 path_provider: ^2.0.11
unicons: ^2.1.1 unicons: ^2.1.1
dev_dependencies:
flutter_lints: ^3.0.1
flutter: flutter:
uses-material-design: false uses-material-design: false
assets: assets:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment