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

Merge branch '34-upgrade-flutter-framework-and-dependencies' into 'master'

Resolve "Upgrade flutter framework and dependencies"

Closes #34

See merge request !30
parents c3994aa8 83f27166
No related branches found
No related tags found
1 merge request!30Resolve "Upgrade flutter framework and dependencies"
Pipeline #3492 passed
...@@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx1536M ...@@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
android.enableR8=true android.enableR8=true
app.versionName=1.2.7 app.versionName=1.2.8
app.versionCode=18 app.versionCode=19
...@@ -5,8 +5,7 @@ import 'provider/data.dart'; ...@@ -5,8 +5,7 @@ import 'provider/data.dart';
import 'screens/home.dart'; import 'screens/home.dart';
import 'screens/game.dart'; import 'screens/game.dart';
import 'screens/scores.dart'; import 'screens/scores.dart';
import './utils/constants.dart'; import 'utils/constants.dart';
import 'package:hangman/utils/constants.dart';
void main() => runApp(Hangman()); void main() => runApp(Hangman());
...@@ -15,7 +14,8 @@ class Hangman extends StatelessWidget { ...@@ -15,7 +14,8 @@ class Hangman extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ChangeNotifierProvider( return ChangeNotifierProvider(
create: (BuildContext context) => Data(), create: (BuildContext context) => Data(),
child: Consumer<Data>(builder: (context, data, child) { child: Consumer<Data>(
builder: (context, data, child) {
return MaterialApp( return MaterialApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: ThemeData( theme: ThemeData(
...@@ -29,7 +29,8 @@ class Hangman extends StatelessWidget { ...@@ -29,7 +29,8 @@ class Hangman extends StatelessWidget {
Scores.id: (context) => Scores(), Scores.id: (context) => Scores(),
}, },
); );
}), },
),
); );
} }
} }
...@@ -102,8 +102,8 @@ class Home extends StatelessWidget { ...@@ -102,8 +102,8 @@ class Home extends StatelessWidget {
), ),
ElevatedButton.icon( ElevatedButton.icon(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
onPrimary: Colors.white, foregroundColor: Colors.white,
primary: Color(board), backgroundColor: Color(board),
padding: EdgeInsets.all(10.0), padding: EdgeInsets.all(10.0),
), ),
onPressed: () async { onPressed: () async {
......
...@@ -25,8 +25,8 @@ class LetterButtons extends StatelessWidget { ...@@ -25,8 +25,8 @@ class LetterButtons extends StatelessWidget {
padding: const EdgeInsets.all(2.0), padding: const EdgeInsets.all(2.0),
child: ElevatedButton( child: ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
primary: Colors.grey, backgroundColor: Colors.grey,
onPrimary: Colors.white, foregroundColor: Colors.white,
shadowColor: Color(accent), shadowColor: Color(accent),
), ),
onPressed: _myProvider.usedLetters.contains(key) onPressed: _myProvider.usedLetters.contains(key)
......
...@@ -7,7 +7,7 @@ packages: ...@@ -7,7 +7,7 @@ packages:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.8.2" version: "2.9.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
...@@ -21,21 +21,14 @@ packages: ...@@ -21,21 +21,14 @@ packages:
name: characters name: characters
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.2.1"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.1"
clock: clock:
dependency: transitive dependency: transitive
description: description:
name: clock name: clock
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.1"
collection: collection:
dependency: transitive dependency: transitive
description: description:
...@@ -63,7 +56,7 @@ packages: ...@@ -63,7 +56,7 @@ packages:
name: fake_async name: fake_async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0" version: "1.3.1"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
...@@ -77,7 +70,7 @@ packages: ...@@ -77,7 +70,7 @@ packages:
name: file name: file
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.1.2" version: "6.1.4"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
...@@ -106,7 +99,7 @@ packages: ...@@ -106,7 +99,7 @@ packages:
name: http name: http
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.13.4" version: "0.13.5"
http_parser: http_parser:
dependency: transitive dependency: transitive
description: description:
...@@ -127,21 +120,21 @@ packages: ...@@ -127,21 +120,21 @@ packages:
name: matcher name: matcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.11" version: "0.12.12"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.4" version: "0.1.5"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.7.0" version: "1.8.0"
nested: nested:
dependency: transitive dependency: transitive
description: description:
...@@ -155,7 +148,7 @@ packages: ...@@ -155,7 +148,7 @@ packages:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.1" version: "1.8.2"
path_provider_linux: path_provider_linux:
dependency: transitive dependency: transitive
description: description:
...@@ -176,7 +169,7 @@ packages: ...@@ -176,7 +169,7 @@ packages:
name: path_provider_windows name: path_provider_windows
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0" version: "2.1.3"
platform: platform:
dependency: transitive dependency: transitive
description: description:
...@@ -190,7 +183,7 @@ packages: ...@@ -190,7 +183,7 @@ packages:
name: plugin_platform_interface name: plugin_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.2" version: "2.1.3"
process: process:
dependency: transitive dependency: transitive
description: description:
...@@ -218,7 +211,7 @@ packages: ...@@ -218,7 +211,7 @@ packages:
name: shared_preferences_android name: shared_preferences_android
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.12" version: "2.0.13"
shared_preferences_ios: shared_preferences_ios:
dependency: transitive dependency: transitive
description: description:
...@@ -246,7 +239,7 @@ packages: ...@@ -246,7 +239,7 @@ packages:
name: shared_preferences_platform_interface name: shared_preferences_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.0" version: "2.1.0"
shared_preferences_web: shared_preferences_web:
dependency: transitive dependency: transitive
description: description:
...@@ -272,7 +265,7 @@ packages: ...@@ -272,7 +265,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.2" version: "1.9.0"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
...@@ -293,21 +286,21 @@ packages: ...@@ -293,21 +286,21 @@ packages:
name: string_scanner name: string_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.1"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
name: term_glyph name: term_glyph
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.2.1"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.9" version: "0.4.12"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
...@@ -328,14 +321,14 @@ packages: ...@@ -328,14 +321,14 @@ packages:
name: win32 name: win32
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.7.0" version: "3.0.0"
xdg_directories: xdg_directories:
dependency: transitive dependency: transitive
description: description:
name: xdg_directories name: xdg_directories
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.0+1" version: "0.2.0+2"
sdks: sdks:
dart: ">=2.17.0 <3.0.0" dart: ">=2.17.0 <3.0.0"
flutter: ">=3.0.0" flutter: ">=3.0.0"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment