diff --git a/android/gradle.properties b/android/gradle.properties
index a6685007b072a81633170be5751ddcdfaa209932..f5d28e1d5fffb6604d4d1748d54afa6ef65cd5a0 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.enableR8=true
-app.versionName=1.2.7
-app.versionCode=18
+app.versionName=1.2.8
+app.versionCode=19
diff --git a/lib/main.dart b/lib/main.dart
index 0c468d9e100d3bc4aca850c90900edc6aa2a14fb..f624310bb3505ba73eee2b7a700c7433d0b94699 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -5,8 +5,7 @@ import 'provider/data.dart';
import 'screens/home.dart';
import 'screens/game.dart';
import 'screens/scores.dart';
-import './utils/constants.dart';
-import 'package:hangman/utils/constants.dart';
+import 'utils/constants.dart';
void main() => runApp(Hangman());
@@ -15,21 +14,23 @@ class Hangman extends StatelessWidget {
Widget build(BuildContext context) {
return ChangeNotifierProvider(
create: (BuildContext context) => Data(),
- child: Consumer<Data>(builder: (context, data, child) {
- return MaterialApp(
- debugShowCheckedModeBanner: false,
- theme: ThemeData(
- primaryColor: Color(darkGreen),
- visualDensity: VisualDensity.adaptivePlatformDensity,
- ),
- home: Home(),
- routes: {
- Home.id: (context) => Home(),
- Game.id: (context) => Game(),
- Scores.id: (context) => Scores(),
- },
- );
- }),
+ child: Consumer<Data>(
+ builder: (context, data, child) {
+ return MaterialApp(
+ debugShowCheckedModeBanner: false,
+ theme: ThemeData(
+ primaryColor: Color(darkGreen),
+ visualDensity: VisualDensity.adaptivePlatformDensity,
+ ),
+ home: Home(),
+ routes: {
+ Home.id: (context) => Home(),
+ Game.id: (context) => Game(),
+ Scores.id: (context) => Scores(),
+ },
+ );
+ },
+ ),
);
}
}
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index 6affdc69acdf9ca53a10630515c8898692dcf8d9..09d9590c4ed0edfa3444c797881c27477ed385c6 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -102,8 +102,8 @@ class Home extends StatelessWidget {
),
ElevatedButton.icon(
style: ElevatedButton.styleFrom(
- onPrimary: Colors.white,
- primary: Color(board),
+ foregroundColor: Colors.white,
+ backgroundColor: Color(board),
padding: EdgeInsets.all(10.0),
),
onPressed: () async {
diff --git a/lib/widgets/letters.dart b/lib/widgets/letters.dart
index e1de350c16c27390111d101511e8d17acf1ae024..d871ab56674b5f46b655b40e763598a417655023 100644
--- a/lib/widgets/letters.dart
+++ b/lib/widgets/letters.dart
@@ -25,8 +25,8 @@ class LetterButtons extends StatelessWidget {
padding: const EdgeInsets.all(2.0),
child: ElevatedButton(
style: ElevatedButton.styleFrom(
- primary: Colors.grey,
- onPrimary: Colors.white,
+ backgroundColor: Colors.grey,
+ foregroundColor: Colors.white,
shadowColor: Color(accent),
),
onPressed: _myProvider.usedLetters.contains(key)
diff --git a/pubspec.lock b/pubspec.lock
index b9eec1c00ff69c1bbded450e6f60bad86394cf92..6b85cf61028231dd26649c51b68b1f5abcd8648d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
- version: "2.8.2"
+ version: "2.9.0"
boolean_selector:
dependency: transitive
description:
@@ -21,21 +21,14 @@ packages:
name: characters
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
- charcode:
- dependency: transitive
- description:
- name: charcode
- url: "https://pub.dartlang.org"
- source: hosted
- version: "1.3.1"
+ version: "1.2.1"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
collection:
dependency: transitive
description:
@@ -63,7 +56,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
- version: "1.3.0"
+ version: "1.3.1"
ffi:
dependency: transitive
description:
@@ -77,7 +70,7 @@ packages:
name: file
url: "https://pub.dartlang.org"
source: hosted
- version: "6.1.2"
+ version: "6.1.4"
flutter:
dependency: "direct main"
description: flutter
@@ -106,7 +99,7 @@ packages:
name: http
url: "https://pub.dartlang.org"
source: hosted
- version: "0.13.4"
+ version: "0.13.5"
http_parser:
dependency: transitive
description:
@@ -127,21 +120,21 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
- version: "0.12.11"
+ version: "0.12.12"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
- version: "0.1.4"
+ version: "0.1.5"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
- version: "1.7.0"
+ version: "1.8.0"
nested:
dependency: transitive
description:
@@ -155,7 +148,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.1"
+ version: "1.8.2"
path_provider_linux:
dependency: transitive
description:
@@ -176,7 +169,7 @@ packages:
name: path_provider_windows
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.0"
+ version: "2.1.3"
platform:
dependency: transitive
description:
@@ -190,7 +183,7 @@ packages:
name: plugin_platform_interface
url: "https://pub.dartlang.org"
source: hosted
- version: "2.1.2"
+ version: "2.1.3"
process:
dependency: transitive
description:
@@ -218,7 +211,7 @@ packages:
name: shared_preferences_android
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.12"
+ version: "2.0.13"
shared_preferences_ios:
dependency: transitive
description:
@@ -246,7 +239,7 @@ packages:
name: shared_preferences_platform_interface
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.0"
+ version: "2.1.0"
shared_preferences_web:
dependency: transitive
description:
@@ -272,7 +265,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
- version: "1.8.2"
+ version: "1.9.0"
stack_trace:
dependency: transitive
description:
@@ -293,21 +286,21 @@ packages:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
+ version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
- version: "0.4.9"
+ version: "0.4.12"
typed_data:
dependency: transitive
description:
@@ -328,14 +321,14 @@ packages:
name: win32
url: "https://pub.dartlang.org"
source: hosted
- version: "2.7.0"
+ version: "3.0.0"
xdg_directories:
dependency: transitive
description:
name: xdg_directories
url: "https://pub.dartlang.org"
source: hosted
- version: "0.2.0+1"
+ version: "0.2.0+2"
sdks:
dart: ">=2.17.0 <3.0.0"
flutter: ">=3.0.0"