Merge branch 'master' of ssh://gvipers.imt-nord-europe.fr:2222/matis.spinelli/amse

tp2/lib/exo6.dart

@@ -62,16 +62,16 @@ class _Exo6 extends State<Exo6> {
                       -1 + 2 * i.toDouble() / (colNb.toDouble() - 1))
           );
 
+          Key k = UniqueKey();
+
           tiles.add(
-            Flexible(child: Container(
+            Flexible(key: k, child: Container(
               margin: EdgeInsets.all(10.0 / colNb),
               child: InkWell(
                 child: tile.croppedImageTile(1 / colNb),
                 onTap: () {
                   setState(() {
-                    print(indexcopy);
-                    tiles.insert(emptyTileIndex, tiles.removeAt(indexcopy));
-                    emptyTileIndex = indexcopy;
+                    swapTiles(k);
                   });
                 }
               )
@@ -84,6 +84,13 @@ class _Exo6 extends State<Exo6> {
     }
   }
 
+  void swapTiles(Key k){
+    var t = tiles.singleWhere((element) => element.key == k);
+    tiles[emptyTileIndex] = t;
+    tiles[tiles.indexOf(t)] = Flexible(child: Container(margin: EdgeInsets.all(10.0 / colNb)));
+    emptyTileIndex = tiles.indexOf(t);
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(