diff --git a/Sources/bowlin_project/lib/model/IUserManager.dart b/Sources/bowlin_project/lib/model/IUserManager.dart index 5254de7..7b78c33 100644 --- a/Sources/bowlin_project/lib/model/IUserManager.dart +++ b/Sources/bowlin_project/lib/model/IUserManager.dart @@ -1,4 +1,5 @@ import 'package:uuid/uuid.dart'; +import 'Player.dart'; import 'User.dart'; import 'IAuthManager.dart'; @@ -11,5 +12,5 @@ abstract class IUserManager { // Methods IAuthManager get authMgr => _authMgr; List getUsersByName(String name); - User getUserById(Uuid id); + Player getUserById(Uuid id); } diff --git a/Sources/bowlin_project/lib/model/StubManager/StubData.dart b/Sources/bowlin_project/lib/model/StubManager/StubData.dart index 88a5efe..d7c32b0 100644 --- a/Sources/bowlin_project/lib/model/StubManager/StubData.dart +++ b/Sources/bowlin_project/lib/model/StubManager/StubData.dart @@ -101,8 +101,13 @@ class StubData extends IManager { List games = []; void _initGame() { - games.add(Game(gameDetails[0].id, - DateTime.now().subtract(Duration(days: 14)), 123, true, [])); - games.add(Game(gameDetails[1].id, DateTime.now(), 101, true, [])); + games.add(Game( + gameDetails[0].id, + DateTime.now().subtract(Duration(days: 14)), + 123, + true, + [players[0].id, players[1].id])); + games.add(Game(gameDetails[1].id, DateTime.now(), 101, true, + [players[1].id, players[0].id])); } } diff --git a/Sources/bowlin_project/lib/model/StubManager/UserManager.dart b/Sources/bowlin_project/lib/model/StubManager/UserManager.dart index b69c6d8..9897745 100644 --- a/Sources/bowlin_project/lib/model/StubManager/UserManager.dart +++ b/Sources/bowlin_project/lib/model/StubManager/UserManager.dart @@ -1,6 +1,8 @@ library StubLib; + import '../IUserManager.dart'; import '../IAuthManager.dart'; +import '../Player.dart'; import 'AuthManager.dart'; import 'StubData.dart'; import '../User.dart'; @@ -11,13 +13,19 @@ class UserManager extends IUserManager { final StubData parent; // Constructor - UserManager(this.parent):super(AuthManager(parent)); + UserManager(this.parent) : super(AuthManager(parent)); // Methods List getUsersByName(String name) { return []; } - User getUserById(Uuid id) { - return User(Uuid(),"","","",[],[], Stat(10,10,10,10,10,10,10,10,10)); + + Player getUserById(Uuid id) { + for (var player in parent.players) { + if (player.id == id) { + return player; + } + } + throw new Exception("Player not found"); } -} \ No newline at end of file +} diff --git a/Sources/bowlin_project/lib/widgets/scores_list_widget.dart b/Sources/bowlin_project/lib/widgets/scores_list_widget.dart index f2acc8f..4b70297 100644 --- a/Sources/bowlin_project/lib/widgets/scores_list_widget.dart +++ b/Sources/bowlin_project/lib/widgets/scores_list_widget.dart @@ -38,7 +38,7 @@ class CardGame extends StatelessWidget { ), ), child: Padding( - padding: EdgeInsets.fromLTRB(120, 3, 0, 0), + padding: EdgeInsets.fromLTRB(120, 3, 3, 0), child: ClipRect( clipBehavior: Clip.hardEdge, child: Opacity( @@ -86,15 +86,17 @@ class CardGame extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Toast( - value: - DateFormat('dd MMMM', 'fr_FR').format(game.date)), - Toast(value: DateFormat('HH:mm').format(game.date)), - ], - ), + Padding( + padding: EdgeInsets.fromLTRB(5, 5, 10, 3), + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Toast( + value: DateFormat('dd MMMM', 'fr_FR') + .format(game.date)), + Toast(value: DateFormat('HH:mm').format(game.date)), + ], + )), Stack( children: [ Row( @@ -104,20 +106,18 @@ class CardGame extends StatelessWidget { Padding( padding: EdgeInsets.fromLTRB(25, 15, 0, 0), child: SizedBox( - width: 130, - child: Wrap( - spacing: 5, - runSpacing: 5, - children: [ - ProfilPicture(), - ProfilPicture(), - ProfilPicture(), - ProfilPicture(), - ProfilPicture(), - ProfilPicture(), - ], - ), - )), + width: 130, + child: Wrap( + spacing: 5, + runSpacing: 5, + children: game.playersId + .map((item) => ProfilPicture( + path: MyApp.controller.userMgr + .getUserById(item) + .image, + )) + .toList(), + ))), Spacer(), Padding( padding: EdgeInsets.fromLTRB(0, 30, 15, 0), @@ -173,15 +173,16 @@ class ListCardGame extends StatelessWidget { } class ProfilPicture extends StatelessWidget { + final String path; + + const ProfilPicture({Key? key, required this.path}) : super(key: key); @override Widget build(BuildContext context) { return Container( height: 25, width: 25, decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage("assets/images/image_user_green.png"), - fit: BoxFit.cover), + image: DecorationImage(image: AssetImage(path), fit: BoxFit.cover), borderRadius: BorderRadius.all(Radius.circular(20)), ), );