diff --git a/android/gradle.properties b/android/gradle.properties index 6a4dd067faf1c98f9fe89600c4b82bbe7a247528..735a31b222ae2d60727ba53bc31642c0b8a5c257 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 dbdf03640c31aae5bb15ccf4919b7a99b6badb5a..a49b1ef9b36d4dd148f6edf74d7c16d9533bd61f 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 eb33f1f7b49a23238c338232ae8ad5f324c9e5f6..0fa8e724277052907e64478d47722200557fd7d1 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 4cf7435f5a0cf1843337756dd8df63121b20d403..3566639a06f82b2f06c16ac4bb9518d6699a0c86 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 aece043ca78cc637a93b612a05c976aebe65bc6b..5aa3d8597f2c472e51747c3ae2442807f9b8de53 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 8776f547bbbdc877d3389edfbc26f34022407e6a..3602587ba91d703d1f07269ac38979cb5a95ce7b 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: