Merge branch 'development' into feature/120-bearbeiten-und-loeschen-von-matches

# Conflicts:
#	lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart

lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart

@@ -5,6 +5,7 @@ import 'package:tallee/core/constants.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
@@ -65,7 +66,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   int selectedGameIndex = -1;
 
   /// The currently selected players
-  List<Player>? selectedPlayers;
+  List<Player> selectedPlayers = [];
 
   /// GlobalKey for ScaffoldMessenger to show snackbars
   final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
@@ -119,7 +120,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   }
 
   List<(String, String, Ruleset)> games = [
-    ('Example Game 1', 'This is a description', Ruleset.leastPoints),
+    ('Example Game 1', 'This is a description', Ruleset.lowestScore),
     ('Example Game 2', '', Ruleset.singleWinner),
   ];
 
@@ -190,8 +191,8 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                     filteredPlayerList = playerList
                         .where(
                           (p) =>
-                              !selectedGroup!.members.any((m) => m.id == p.id),
-                        )
+                      !selectedGroup!.members.any((m) => m.id == p.id),
+                    )
                         .toList();
                   } else {
                     filteredPlayerList = List.from(playerList);
@@ -202,7 +203,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
               Expanded(
                 child: PlayerSelection(
                   key: ValueKey(selectedGroup?.id ?? 'no_group'),
-                  initialSelectedPlayers: selectedPlayers ?? [],
+                  initialSelectedPlayers: selectedPlayers,
                   availablePlayers: filteredPlayerList,
                   onChanged: (value) {
                     setState(() {
@@ -235,10 +236,36 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// - Either a group is selected OR at least 2 players are selected
   bool _enableCreateGameButton() {
     return (selectedGroup != null ||
-        (selectedPlayers != null && selectedPlayers!.length > 1));
+        (selectedPlayers.length > 1));
   }
 
   void buttonNavigation(BuildContext context) async {
+    // Use a game from the games list
+    Game? gameToUse;
+    if (selectedGameIndex == -1) {
+      // Use the first game as default if none selected
+      final selectedGame = games[0];
+      gameToUse = Game(
+        name: selectedGame.$1,
+        description: selectedGame.$2,
+        ruleset: selectedGame.$3,
+        color: GameColor.blue,
+        icon: '',
+      );
+    } else {
+      // Use the selected game from the list
+      final selectedGame = games[selectedGameIndex];
+      gameToUse = Game(
+        name: selectedGame.$1,
+        description: selectedGame.$2,
+        ruleset: selectedGame.$3,
+        color: GameColor.blue,
+        icon: '',
+      );
+    }
+    // Add the game to the database if it doesn't exist
+    await db.gameDao.addGame(game: gameToUse);
+
     if (widget.match != null) {
       // TODO: Implement updating match logic here
       Navigator.pop(context);
@@ -250,6 +277,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
         createdAt: DateTime.now(),
         group: selectedGroup,
         players: selectedPlayers,
+        game: gameToUse
       );
       await db.matchDao.addMatch(match: match);
       if (context.mounted) {
@@ -266,4 +294,4 @@ class _CreateMatchViewState extends State<CreateMatchView> {
       }
     }
   }
-}
+}

lib/presentation/views/main_menu/match_view/match_result_view.dart

@@ -153,12 +153,10 @@ class _MatchResultViewState extends State<MatchResultView> {
   List<Player> getAllPlayers(Match match) {
     List<Player> players = [];
 
-    if (match.group == null && match.players != null) {
-      players = [...match.players!];
-    } else if (match.group != null && match.players != null) {
-      players = [...match.players!, ...match.group!.members];
+    if (match.group == null) {
+      players = [...match.players];
     } else {
-      players = [...match.group!.members];
+      players = [...match.players, ...match.group!.members];
     }
 
     players.sort((a, b) => a.name.compareTo(b.name));

lib/presentation/views/main_menu/match_view/match_view.dart

@@ -6,7 +6,9 @@ import 'package:provider/provider.dart';
 import 'package:tallee/core/adaptive_page_route.dart';
 import 'package:tallee/core/constants.dart';
 import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/game.dart';
 import 'package:tallee/data/dto/group.dart';
 import 'package:tallee/data/dto/match.dart';
 import 'package:tallee/data/dto/player.dart';
@@ -36,12 +38,15 @@ class _MatchViewState extends State<MatchView> {
     4,
     Match(
       name: 'Skeleton match name',
+      game: Game(name: '', ruleset: Ruleset.singleWinner, description: '', color: GameColor.blue, icon: ''),
       group: Group(
         name: 'Group name',
-        members: List.filled(5, Player(name: 'Player')),
+        description: '',
+        members: List.filled(5, Player(name: 'Player', description: '')),
       ),
-      winner: Player(name: 'Player'),
-      players: [Player(name: 'Player')],
+      winner: Player(name: 'Player', description: ''),
+      players: [Player(name: 'Player', description: '')],
+      notes: '',
     ),
   );