From 846be41cebaa7e67bf04d9dcb70b7fb2bea7e9cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Harrault?= <benoit@harrault.fr>
Date: Tue, 5 Jul 2022 15:56:58 +0200
Subject: [PATCH] Upgrade Flutter framework and dependencies
---
android/gradle.properties | 4 ++--
lib/data/data.dart | 2 +-
lib/main.dart | 8 ++++----
lib/models/TileModel.dart | 6 +++---
pubspec.lock | 2 +-
pubspec.yaml | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/android/gradle.properties b/android/gradle.properties
index 6a4dd06..735a31b 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
-app.versionName=1.0.10
-app.versionCode=11
+app.versionName=1.0.11
+app.versionCode=12
diff --git a/lib/data/data.dart b/lib/data/data.dart
index dbdf036..a49b1ef 100644
--- a/lib/data/data.dart
+++ b/lib/data/data.dart
@@ -1,7 +1,7 @@
import 'package:memory/models/TileModel.dart';
String selectedTile = "";
-int selectedIndex;
+int selectedIndex = 0;
bool selected = true;
int points = 0;
diff --git a/lib/main.dart b/lib/main.dart
index eb33f1f..0fa8e72 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -145,9 +145,9 @@ class _HomeState extends State<Home> {
class Tile extends StatefulWidget {
final String imagePathUrl;
final int tileIndex;
- final _HomeState parent;
+ final _HomeState? parent;
- Tile({this.imagePathUrl, this.tileIndex, this.parent});
+ Tile({this.imagePathUrl: '', this.tileIndex: 0, this.parent});
@override
_TileState createState() => _TileState();
@@ -177,7 +177,7 @@ class _TileState extends State<Tile> {
myPairs[widget.tileIndex] = tileModel;
print(selectedIndex);
myPairs[selectedIndex] = tileModel;
- this.widget.parent.setState(() {});
+ this.widget.parent?.setState(() {});
setState(() {
selected = false;
});
@@ -190,7 +190,7 @@ class _TileState extends State<Tile> {
print(selectedIndex);
selected = true;
Future.delayed(const Duration(seconds: 2), () {
- this.widget.parent.setState(() {
+ this.widget.parent?.setState(() {
myPairs[widget.tileIndex].setIsSelected(false);
myPairs[selectedIndex].setIsSelected(false);
});
diff --git a/lib/models/TileModel.dart b/lib/models/TileModel.dart
index 4cf7435..3566639 100644
--- a/lib/models/TileModel.dart
+++ b/lib/models/TileModel.dart
@@ -1,8 +1,8 @@
class TileModel {
- String imageAssetPath;
- bool isSelected;
+ String imageAssetPath = "";
+ bool isSelected = false;
- TileModel({this.imageAssetPath, this.isSelected});
+ TileModel({this.imageAssetPath: "", this.isSelected: false});
void setImageAssetPath(String getImageAssetPath) {
imageAssetPath = getImageAssetPath;
diff --git a/pubspec.lock b/pubspec.lock
index aece043..5aa3d85 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -49,7 +49,7 @@ packages:
name: cupertino_icons
url: "https://pub.dartlang.org"
source: hosted
- version: "0.1.3"
+ version: "1.0.5"
fake_async:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 8776f54..3602587 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,12 +4,12 @@ description: A simple and classic memory game.
version: 1.0.0+1
environment:
- sdk: ">=2.1.0 <3.0.0"
+ sdk: ">=2.16.1 <3.0.0"
dependencies:
flutter:
sdk: flutter
- cupertino_icons: ^0.1.2
+ cupertino_icons: ^1.0.5
dev_dependencies:
flutter_test:
--
GitLab