Merge remote-tracking branch 'refs/remotes/origin/development' into feature/31-json-import-fuer-testdaten

Reviewed-on: #35

lib/data/dto/game.dart

@@ -1,5 +1,6 @@
 import 'package:game_tracker/data/dto/group.dart';
 import 'package:game_tracker/data/dto/player.dart';
+import 'package:uuid/uuid.dart';
 
 class Game {
   final String id;
@@ -9,12 +10,12 @@ class Game {
   final String winner;
 
   Game({
+    String? id,
+    required this.name,
     this.players,
     this.group,
     this.winner = '',
-    required this.id,
+  }) : id = id ?? const Uuid().v4();
-    required this.name,
-  });
 
   @override
   String toString() {

lib/data/dto/group.dart

@@ -1,11 +1,13 @@
 import 'package:game_tracker/data/dto/player.dart';
+import 'package:uuid/uuid.dart';
 
 class Group {
   final String id;
   final String name;
   final List<Player> members;
 
-  Group({required this.id, required this.name, required this.members});
+  Group({String? id, required this.name, required this.members})
+    : id = id ?? const Uuid().v4();
 
   @override
   String toString() {

lib/data/dto/player.dart

@@ -1,8 +1,10 @@
+import 'package:uuid/uuid.dart';
+
 class Player {
   final String id;
   final String name;
 
-  Player({required this.id, required this.name});
+  Player({String? id, required this.name}) : id = id ?? const Uuid().v4();
 
   @override
   String toString() {

lib/presentation/views/main_menu/groups_view.dart

@@ -19,12 +19,11 @@ class GroupsView extends StatefulWidget {
 class _GroupsViewState extends State<GroupsView> {
   late Future<List<Group>> _allGroupsFuture;
 
-  final player = Player(id: 'p1', name: 'Sample');
+  final player = Player(name: 'Skeleton Player');
   late final List<Group> skeletonData = List.filled(
     7,
     Group(
-      id: '0',
+      name: 'Skeleton Game',
-      name: 'Sample Game',
       members: [player, player, player, player, player, player],
     ),
   );

lib/presentation/widgets/tiles/settings_list_tile.dart

@@ -21,6 +21,8 @@ class SettingsListTile extends StatelessWidget {
       child: Center(
         child: SizedBox(
           width: MediaQuery.of(context).size.width * 0.95,
+          child: GestureDetector(
+            onTap: onPressed ?? () {},
             child: Container(
               margin: EdgeInsets.zero,
               padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 14),
@@ -29,8 +31,6 @@ class SettingsListTile extends StatelessWidget {
                 border: Border.all(color: CustomTheme.boxBorder),
                 borderRadius: BorderRadius.circular(12),
               ),
-            child: GestureDetector(
-              onTap: onPressed ?? () {},
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [

pubspec.yaml

@@ -19,6 +19,7 @@ dependencies:
   path_provider: ^2.1.5
   provider: ^6.1.5
   skeletonizer: ^2.1.0+1
+  uuid: ^4.5.2
 
 dev_dependencies:
   flutter_test:

test/db_tests/game_test.dart

@@ -12,6 +12,7 @@ void main() {
   late Player player2;
   late Player player3;
   late Player player4;
+  late Player player5;
   late Group testgroup;
   late Game testgame;
 
@@ -24,20 +25,16 @@ void main() {
       ),
     );
 
-    player1 = Player(id: 'p1', name: 'Alice');
+    player1 = Player(name: 'Alice');
-    player2 = Player(id: 'p2', name: 'Bob');
+    player2 = Player(name: 'Bob');
-    player3 = Player(id: 'p3', name: 'Charlie');
+    player3 = Player(name: 'Charlie');
-    player4 = Player(id: 'p4', name: 'Diana');
+    player4 = Player(name: 'Diana');
-    testgroup = Group(
+    player5 = Player(name: 'Eve');
-      id: 'gr1',
+    testgroup = Group(name: 'Test Group', members: [player1, player2, player3]);
-      name: 'Test Group',
-      members: [player1, player2, player3],
-    );
     testgame = Game(
-      id: 'ga1',
       name: 'Test Game',
       group: testgroup,
-      players: [player4],
+      players: [player4, player5],
     );
   });
   tearDown(() async {

test/db_tests/group_test.dart

@@ -22,15 +22,11 @@ void main() {
       ),
     );
 
-    player1 = Player(id: 'p1', name: 'Alice');
+    player1 = Player(name: 'Alice');
-    player2 = Player(id: 'p2', name: 'Bob');
+    player2 = Player(name: 'Bob');
-    player3 = Player(id: 'p3', name: 'Charlie');
+    player3 = Player(name: 'Charlie');
-    player4 = Player(id: 'p4', name: 'Diana');
+    player4 = Player(name: 'Diana');
-    testgroup = Group(
+    testgroup = Group(name: 'Test Group', members: [player1, player2, player3]);
-      id: 'gr1',
-      name: 'Test Group',
-      members: [player1, player2, player3],
-    );
   });
   tearDown(() async {
     await database.close();
@@ -121,12 +117,12 @@ void main() {
 
       expect(playerAdded, true);
 
-      final playerAdded2 = await database.playerGroupDao.isPlayerInGroup(
+      final playerNotAdded = !await database.playerGroupDao.isPlayerInGroup(
-        playerId: 'a',
+        playerId: '',
         groupId: testgroup.id,
       );
 
-      expect(playerAdded2, false);
+      expect(playerNotAdded, true);
 
       expect(playerAdded, true);
 

test/db_tests/player_test.dart

@@ -17,7 +17,7 @@ void main() {
       ),
     );
 
-    testPlayer = Player(id: 'test_id', name: 'Test Player');
+    testPlayer = Player(name: 'Test Player');
   });
   tearDown(() async {
     await database.close();
@@ -25,7 +25,7 @@ void main() {
 
   group('player tests', () {
     test('all players get fetched correctly', () async {
-      final testPlayer2 = Player(id: 'gr2', name: 'Second Group');
+      final testPlayer2 = Player(name: 'Second Group');
       await database.playerDao.addPlayer(player: testPlayer);
       await database.playerDao.addPlayer(player: testPlayer2);