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

Upgrade Flutter framework and dependencies

parent 53df2b0e
No related branches found
No related tags found
1 merge request!13Resolve "Upgrade Flutter framework and dependencies"
Pipeline #2948 passed
...@@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx1536M ...@@ -2,5 +2,5 @@ org.gradle.jvmargs=-Xmx1536M
android.enableR8=true android.enableR8=true
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=1.0.10 app.versionName=1.0.11
app.versionCode=11 app.versionCode=12
import 'package:memory/models/TileModel.dart'; import 'package:memory/models/TileModel.dart';
String selectedTile = ""; String selectedTile = "";
int selectedIndex; int selectedIndex = 0;
bool selected = true; bool selected = true;
int points = 0; int points = 0;
......
...@@ -145,9 +145,9 @@ class _HomeState extends State<Home> { ...@@ -145,9 +145,9 @@ class _HomeState extends State<Home> {
class Tile extends StatefulWidget { class Tile extends StatefulWidget {
final String imagePathUrl; final String imagePathUrl;
final int tileIndex; 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 @override
_TileState createState() => _TileState(); _TileState createState() => _TileState();
...@@ -177,7 +177,7 @@ class _TileState extends State<Tile> { ...@@ -177,7 +177,7 @@ class _TileState extends State<Tile> {
myPairs[widget.tileIndex] = tileModel; myPairs[widget.tileIndex] = tileModel;
print(selectedIndex); print(selectedIndex);
myPairs[selectedIndex] = tileModel; myPairs[selectedIndex] = tileModel;
this.widget.parent.setState(() {}); this.widget.parent?.setState(() {});
setState(() { setState(() {
selected = false; selected = false;
}); });
...@@ -190,7 +190,7 @@ class _TileState extends State<Tile> { ...@@ -190,7 +190,7 @@ class _TileState extends State<Tile> {
print(selectedIndex); print(selectedIndex);
selected = true; selected = true;
Future.delayed(const Duration(seconds: 2), () { Future.delayed(const Duration(seconds: 2), () {
this.widget.parent.setState(() { this.widget.parent?.setState(() {
myPairs[widget.tileIndex].setIsSelected(false); myPairs[widget.tileIndex].setIsSelected(false);
myPairs[selectedIndex].setIsSelected(false); myPairs[selectedIndex].setIsSelected(false);
}); });
......
class TileModel { class TileModel {
String imageAssetPath; String imageAssetPath = "";
bool isSelected; bool isSelected = false;
TileModel({this.imageAssetPath, this.isSelected}); TileModel({this.imageAssetPath: "", this.isSelected: false});
void setImageAssetPath(String getImageAssetPath) { void setImageAssetPath(String getImageAssetPath) {
imageAssetPath = getImageAssetPath; imageAssetPath = getImageAssetPath;
......
...@@ -49,7 +49,7 @@ packages: ...@@ -49,7 +49,7 @@ packages:
name: cupertino_icons name: cupertino_icons
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.3" version: "1.0.5"
fake_async: fake_async:
dependency: transitive dependency: transitive
description: description:
......
...@@ -4,12 +4,12 @@ description: A simple and classic memory game. ...@@ -4,12 +4,12 @@ description: A simple and classic memory game.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.1.0 <3.0.0" sdk: ">=2.16.1 <3.0.0"
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
cupertino_icons: ^0.1.2 cupertino_icons: ^1.0.5
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment