Disable icon for members in group tile

- Replaced `borderColor` and `infillColor` parameters with a `buttonStyle` parameter.
- Introduced `ButtonStyle` enum (primary/secondary) to control styling.
- Updated `CustomWidthButton` to derive colors from `CustomTheme` based on the selected `ButtonStyle`.

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,
-    required this.name,
-  });
+  }) : id = id ?? const Uuid().v4();
 
   @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/create_group/create_group_view.dart

@@ -11,7 +11,6 @@ import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
 import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 import 'package:provider/provider.dart';
 import 'package:skeletonizer/skeletonizer.dart';
-import 'package:uuid/uuid.dart';
 
 class CreateGroupView extends StatefulWidget {
   const CreateGroupView({super.key});
@@ -28,7 +27,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
   late Future<List<Player>> _allPlayersFuture;
   late final List<Player> skeletonData = List.filled(
     7,
-    Player(id: '0', name: 'Player 0'),
+    Player(name: 'Player 0'),
   );
   final _groupNameController = TextEditingController();
   final _searchBarController = TextEditingController();
@@ -56,8 +55,8 @@ class _CreateGroupViewState extends State<CreateGroupView> {
           backgroundColor: CustomTheme.backgroundColor,
           scrolledUnderElevation: 0,
           title: const Text(
-            "Create new group",
-            style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+            'Create new group',
+            style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
           ),
           centerTitle: true,
         ),
@@ -94,8 +93,11 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                   children: [
                     CustomSearchBar(
                       controller: _searchBarController,
-                      constraints: BoxConstraints(maxHeight: 45, minHeight: 45),
-                      hintText: "Search for players",
+                      constraints: const BoxConstraints(
+                        maxHeight: 45,
+                        minHeight: 45,
+                      ),
+                      hintText: 'Search for players',
                       onChanged: (value) {
                         setState(() {
                           if (value.isEmpty) {
@@ -115,35 +117,34 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                         });
                       },
                     ),
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Text(
-                      "Ausgewählte Spieler: (${selectedPlayers.length})",
-                      style: TextStyle(
+                      'Ausgewählte Spieler: (${selectedPlayers.length})',
+                      style: const TextStyle(
                         fontSize: 16,
                         fontWeight: FontWeight.bold,
                       ),
                     ),
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Wrap(
                       alignment: WrapAlignment.start,
                       crossAxisAlignment: WrapCrossAlignment.start,
                       spacing: 8.0,
                       runSpacing: 8.0,
                       children: <Widget>[
-                        for (var selectedPlayer in selectedPlayers)
+                        for (var player in selectedPlayers)
                           TextIconTile(
-                            text: selectedPlayer.name,
-                            icon: Icons.close,
+                            text: player.name,
                             onIconTap: () {
                               setState(() {
                                 final currentSearch = _searchBarController.text
                                     .toLowerCase();
-                                selectedPlayers.remove(selectedPlayer);
+                                selectedPlayers.remove(player);
                                 if (currentSearch.isEmpty ||
-                                    selectedPlayer.name.toLowerCase().contains(
+                                    player.name.toLowerCase().contains(
                                       currentSearch,
                                     )) {
-                                  suggestedPlayers.add(selectedPlayer);
+                                  suggestedPlayers.add(player);
                                   suggestedPlayers.sort(
                                     (a, b) => a.name.compareTo(b.name),
                                   );
@@ -153,15 +154,15 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                           ),
                       ],
                     ),
-                    SizedBox(height: 10),
-                    Text(
-                      "Alle Spieler:",
+                    const SizedBox(height: 10),
+                    const Text(
+                      'Alle Spieler:',
                       style: TextStyle(
                         fontSize: 16,
                         fontWeight: FontWeight.bold,
                       ),
                     ),
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     FutureBuilder(
                       future: _allPlayersFuture,
                       builder:
@@ -216,7 +217,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                                     ),
                                 child:
                                     (suggestedPlayers.isEmpty &&
-                                        !allPlayers.isEmpty)
+                                        allPlayers.isNotEmpty)
                                     ? TopCenteredMessage(
                                         icon: Icons.info,
                                         title: 'Info',
@@ -230,10 +231,9 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                                         itemCount: suggestedPlayers.length,
                                         itemBuilder:
                                             (BuildContext context, int index) {
-                                              return IconListTile(
+                                              return TextIconListTile(
                                                 text: suggestedPlayers[index]
                                                     .name,
-                                                icon: Icons.add,
                                                 onPressed: () {
                                                   setState(() {
                                                     if (!selectedPlayers.contains(
@@ -264,9 +264,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
               ),
             ),
             CustomWidthButton(
-              text: "Create group",
-              infillColor: CustomTheme.primaryColor,
-              borderColor: CustomTheme.primaryColor,
+              text: 'Create group',
               disabledInfillColor: CustomTheme.boxColor,
               sizeRelativeToWidth: 0.95,
               onPressed:
@@ -275,7 +273,6 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                   : () async {
                       bool success = await db.groupDao.addGroup(
                         group: Group(
-                          id: Uuid().v4(),
                           name: _groupNameController.text,
                           members: selectedPlayers,
                         ),
@@ -284,14 +281,16 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                         _groupNameController.clear();
                         _searchBarController.clear();
                         selectedPlayers.clear();
+                        if (!mounted) return;
                         Navigator.pop(context);
                       } else {
+                        if (!mounted) return;
                         ScaffoldMessenger.of(context).showSnackBar(
                           SnackBar(
                             backgroundColor: CustomTheme.boxColor,
-                            content: Center(
+                            content: const Center(
                               child: Text(
-                                "Error while creating group, please try again",
+                                'Error while creating group, please try again',
                                 style: TextStyle(color: Colors.white),
                               ),
                             ),
@@ -301,7 +300,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                       setState(() {});
                     },
             ),
-            SizedBox(height: 20),
+            const SizedBox(height: 20),
           ],
         ),
       ),

lib/presentation/views/main_menu/groups_view.dart

@@ -21,12 +21,11 @@ class _GroupsViewState extends State<GroupsView> {
   late Future<List<Group>> _allGroupsFuture;
   late final AppDatabase db;
 
-  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: 'Sample Game',
+      name: 'Skeleton Game',
       members: [player, player, player, player, player, player],
     ),
   );
@@ -107,8 +106,6 @@ class _GroupsViewState extends State<GroupsView> {
             bottom: 80,
             child: CustomWidthButton(
               text: 'Create Group',
-              infillColor: CustomTheme.primaryColor,
-              borderColor: CustomTheme.primaryColor,
               sizeRelativeToWidth: 0.90,
               onPressed: () async {
                 await Navigator.push(

lib/presentation/widgets/custom_search_bar.dart

@@ -23,14 +23,14 @@ class CustomSearchBar extends StatelessWidget {
           constraints ?? const BoxConstraints(maxHeight: 45, minHeight: 45),
       hintText: hintText,
       onChanged: onChanged,
-      hintStyle: MaterialStateProperty.all(const TextStyle(fontSize: 16)),
+      hintStyle: WidgetStateProperty.all(const TextStyle(fontSize: 16)),
       leading: const Icon(Icons.search),
-      backgroundColor: MaterialStateProperty.all(CustomTheme.boxColor),
-      side: MaterialStateProperty.all(BorderSide(color: CustomTheme.boxBorder)),
-      shape: MaterialStateProperty.all(
+      backgroundColor: WidgetStateProperty.all(CustomTheme.boxColor),
+      side: WidgetStateProperty.all(BorderSide(color: CustomTheme.boxBorder)),
+      shape: WidgetStateProperty.all(
         RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
       ),
-      elevation: MaterialStateProperty.all(0),
+      elevation: WidgetStateProperty.all(0),
     );
   }
 }

lib/presentation/widgets/custom_width_button.dart

@@ -1,22 +1,23 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+
+enum ButtonStyle { primary, secondary }
 
 class CustomWidthButton extends StatelessWidget {
   const CustomWidthButton({
     super.key,
     required this.text,
-    required this.borderColor,
-    required this.infillColor,
     this.disabledInfillColor,
+    this.buttonStyle = ButtonStyle.primary,
     required this.sizeRelativeToWidth,
     required this.onPressed,
   });
 
   final String text;
-  final Color borderColor;
-  final Color infillColor;
   final Color? disabledInfillColor;
   final double sizeRelativeToWidth;
   final VoidCallback? onPressed;
+  final ButtonStyle buttonStyle;
 
   @override
   Widget build(BuildContext context) {
@@ -28,8 +29,15 @@ class CustomWidthButton extends StatelessWidget {
           MediaQuery.sizeOf(context).width * sizeRelativeToWidth,
           60,
         ),
-        backgroundColor: infillColor,
-        side: BorderSide(color: borderColor, width: 2),
+        backgroundColor: buttonStyle == ButtonStyle.primary
+            ? CustomTheme.primaryColor
+            : CustomTheme.secondaryColor,
+        side: BorderSide(
+          color: buttonStyle == ButtonStyle.primary
+              ? CustomTheme.primaryColor
+              : CustomTheme.secondaryColor,
+          width: 2,
+        ),
         shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
       ),
       child: Text(

lib/presentation/widgets/tiles/group_tile.dart

@@ -56,7 +56,8 @@ class GroupTile extends StatelessWidget {
             spacing: 12.0,
             runSpacing: 8.0,
             children: <Widget>[
-              for (var member in group.members) TextIconTile(text: member.name),
+              for (var member in group.members)
+                TextIconTile(text: member.name, iconEnabled: false),
             ],
           ),
           const SizedBox(height: 2.5),

lib/presentation/widgets/tiles/text_icon_list_tile.dart

@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-class IconListTile extends StatelessWidget {
+class TextIconListTile extends StatelessWidget {
   final String text;
-  final IconData icon;
   final VoidCallback onPressed;
+  final bool iconEnabled;
 
-  const IconListTile({
+  const TextIconListTile({
     super.key,
     required this.text,
-    required this.icon,
     required this.onPressed,
+    this.iconEnabled = true,
   });
 
   @override
@@ -28,13 +28,23 @@ class IconListTile extends StatelessWidget {
         mainAxisSize: MainAxisSize.max,
         children: [
           Flexible(
+            child: Container(
+              padding: const EdgeInsets.symmetric(vertical: 12.5),
               child: Text(
                 text,
                 overflow: TextOverflow.ellipsis,
-              style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w500),
+                style: const TextStyle(
+                  fontSize: 16,
+                  fontWeight: FontWeight.w500,
                 ),
               ),
-          IconButton(icon: Icon(icon, size: 20), onPressed: onPressed),
+            ),
+          ),
+          if (iconEnabled)
+            IconButton(
+              icon: const Icon(Icons.add, size: 20),
+              onPressed: onPressed,
+            ),
         ],
       ),
     );

lib/presentation/widgets/tiles/text_icon_tile.dart

@@ -3,14 +3,14 @@ import 'package:game_tracker/core/custom_theme.dart';
 
 class TextIconTile extends StatelessWidget {
   final String text;
-  final IconData? icon;
+  final bool iconEnabled;
   final VoidCallback? onIconTap;
 
   const TextIconTile({
     super.key,
     required this.text,
-    this.icon,
     this.onIconTap,
+    this.iconEnabled = true,
   });
 
   @override
@@ -25,7 +25,7 @@ class TextIconTile extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         mainAxisSize: MainAxisSize.min,
         children: [
-          if (icon != null) const SizedBox(width: 3),
+          if (iconEnabled) const SizedBox(width: 3),
           Flexible(
             child: Text(
               text,
@@ -33,9 +33,12 @@ class TextIconTile extends StatelessWidget {
               style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500),
             ),
           ),
-          if (icon != null) ...<Widget>[
+          if (iconEnabled) ...<Widget>[
             const SizedBox(width: 3),
-            GestureDetector(onTap: onIconTap, child: Icon(icon, size: 20)),
+            GestureDetector(
+              onTap: onIconTap,
+              child: const Icon(Icons.close, size: 20),
+            ),
           ],
         ],
       ),

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');
-    player2 = Player(id: 'p2', name: 'Bob');
-    player3 = Player(id: 'p3', name: 'Charlie');
-    player4 = Player(id: 'p4', name: 'Diana');
-    testgroup = Group(
-      id: 'gr1',
-      name: 'Test Group',
-      members: [player1, player2, player3],
-    );
+    player1 = Player(name: 'Alice');
+    player2 = Player(name: 'Bob');
+    player3 = Player(name: 'Charlie');
+    player4 = Player(name: 'Diana');
+    player5 = Player(name: 'Eve');
+    testgroup = Group(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');
-    player2 = Player(id: 'p2', name: 'Bob');
-    player3 = Player(id: 'p3', name: 'Charlie');
-    player4 = Player(id: 'p4', name: 'Diana');
-    testgroup = Group(
-      id: 'gr1',
-      name: 'Test Group',
-      members: [player1, player2, player3],
-    );
+    player1 = Player(name: 'Alice');
+    player2 = Player(name: 'Bob');
+    player3 = Player(name: 'Charlie');
+    player4 = Player(name: 'Diana');
+    testgroup = Group(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(
-        playerId: 'a',
+      final playerNotAdded = !await database.playerGroupDao.isPlayerInGroup(
+        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);