From b5e7fe23ab335388eb8ee28fe781dc77fab3b899 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 17 Nov 2025 13:10:08 +0100 Subject: [PATCH 01/89] changed fullwidthbutton to include size, borderColor and infillColor attributes --- .../widgets/full_width_button.dart | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/presentation/widgets/full_width_button.dart b/lib/presentation/widgets/full_width_button.dart index bd18c64..fc2ca78 100644 --- a/lib/presentation/widgets/full_width_button.dart +++ b/lib/presentation/widgets/full_width_button.dart @@ -1,10 +1,19 @@ import 'package:flutter/material.dart'; -import 'package:game_tracker/core/custom_theme.dart'; class FullWidthButton extends StatelessWidget { - const FullWidthButton({super.key, required this.text, this.onPressed}); + const FullWidthButton({ + super.key, + required this.text, + required this.borderColor, + required this.infillColor, + required this.sizeRelativeToWidth, + required this.onPressed, + }); final String text; + final Color borderColor; + final Color infillColor; + final double sizeRelativeToWidth; final VoidCallback? onPressed; @override @@ -12,8 +21,12 @@ class FullWidthButton extends StatelessWidget { return ElevatedButton( onPressed: onPressed, style: ElevatedButton.styleFrom( - minimumSize: Size(MediaQuery.sizeOf(context).width * 0.9, 60), - backgroundColor: CustomTheme.primaryColor, + minimumSize: Size( + MediaQuery.sizeOf(context).width * sizeRelativeToWidth, + 60, + ), + backgroundColor: infillColor, + side: BorderSide(color: borderColor, width: 2), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), ), child: Text( From a54495f915447d0b0b42cfa959b751dc77eb87da Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 17 Nov 2025 13:10:33 +0100 Subject: [PATCH 02/89] implemented basic CreateGroupView without functionality --- .../create_group/create_group_view.dart | 309 ++++++++++++++++++ 1 file changed, 309 insertions(+) create mode 100644 lib/presentation/views/main_menu/create_group/create_group_view.dart diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart new file mode 100644 index 0000000..63daf62 --- /dev/null +++ b/lib/presentation/views/main_menu/create_group/create_group_view.dart @@ -0,0 +1,309 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; +import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/dto/player.dart'; +import 'package:game_tracker/presentation/widgets/full_width_button.dart'; +import 'package:game_tracker/presentation/widgets/top_centered_message.dart'; +import 'package:provider/provider.dart'; +import 'package:skeletonizer/skeletonizer.dart'; + +class CreateGroupView extends StatefulWidget { + const CreateGroupView({super.key}); + + @override + State createState() => _CreateGroupViewState(); +} + +class _CreateGroupViewState extends State { + List selectedPlayers = [ + Player(id: '0', name: 'Player 0'), + Player(id: '0', name: 'Player 0'), + Player(id: '0', name: 'Player 0'), + Player(id: '0', name: 'Player 0'), + ]; + late Future> _allPlayersFuture; + late final List skeletonData = List.filled( + 7, + Player(id: '0', name: 'Player 0'), + ); + + @override + @override + void initState() { + super.initState(); + final db = Provider.of(context, listen: false); + _allPlayersFuture = db.playerDao.getAllPlayers(); + } + + @override + Widget build(BuildContext context) { + addSamplePlayers(context); + return SafeArea( + child: Scaffold( + backgroundColor: CustomTheme.backgroundColor, + appBar: AppBar( + backgroundColor: CustomTheme.backgroundColor, + title: const Text( + "Create new group", + style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold), + ), + centerTitle: true, + ), + body: Column( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Container( + margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), + child: TextField( + decoration: InputDecoration( + filled: true, + fillColor: CustomTheme.boxColor, + hint: Text("Group name", style: TextStyle(fontSize: 18)), + enabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.all(Radius.circular(12)), + borderSide: BorderSide(color: CustomTheme.boxBorder), + ), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.all(Radius.circular(12)), + borderSide: BorderSide(color: CustomTheme.boxBorder), + ), + floatingLabelBehavior: FloatingLabelBehavior.never, + ), + ), + ), + Expanded( + child: Container( + margin: const EdgeInsets.symmetric( + horizontal: 12, + vertical: 10, + ), + padding: const EdgeInsets.symmetric( + vertical: 10, + horizontal: 10, + ), + decoration: BoxDecoration( + color: CustomTheme.boxColor, + border: Border.all(color: CustomTheme.boxBorder), + borderRadius: BorderRadius.circular(12), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SearchBar( + constraints: BoxConstraints(maxHeight: 45, minHeight: 45), + hintText: "Search for players", + hintStyle: WidgetStateProperty.all( + TextStyle(fontSize: 16), + ), + leading: Icon(Icons.search), + backgroundColor: WidgetStateProperty.all( + CustomTheme.boxColor, + ), + side: WidgetStateProperty.all( + BorderSide(color: CustomTheme.boxBorder), + ), + shape: WidgetStateProperty.all( + RoundedRectangleBorder( + borderRadius: BorderRadius.circular(12), + ), + ), + ), + SizedBox(height: 10), + Text( + "Ausgewählte Spieler: (X)", + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + ), + ), + SizedBox(height: 10), + Wrap( + alignment: WrapAlignment.start, + crossAxisAlignment: WrapCrossAlignment.start, + spacing: 8.0, + runSpacing: 8.0, + children: [ + for (var player in selectedPlayers) + Container( + padding: EdgeInsets.all(5), + decoration: BoxDecoration( + color: CustomTheme.onBoxColor, + borderRadius: BorderRadius.circular(12), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.min, + children: [ + SizedBox(width: 12), + Text( + player.name, + style: const TextStyle( + fontSize: 14, + fontWeight: FontWeight.w500, + ), + ), + SizedBox(width: 3), + GestureDetector( + child: const Icon(Icons.close, size: 20), + onTap: () { + setState(() { + selectedPlayers.remove(player); + }); + }, + ), + ], + ), + ), + ], + ), + SizedBox(height: 10), + Text( + "Alle Spieler:", + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + ), + ), + SizedBox(height: 10), + FutureBuilder( + future: _allPlayersFuture, + builder: + ( + BuildContext context, + AsyncSnapshot> snapshot, + ) { + if (snapshot.hasError) { + return const Center( + child: TopCenteredMessage( + icon: Icons.report, + title: 'Error', + message: 'Player data couldn\'t\nbe loaded.', + ), + ); + } + if (snapshot.connectionState == + ConnectionState.done && + (!snapshot.hasData || snapshot.data!.isEmpty)) { + return const Center( + child: TopCenteredMessage( + icon: Icons.info, + title: 'Info', + message: 'No players created yet.', + ), + ); + } + final bool isLoading = + snapshot.connectionState == + ConnectionState.waiting; + final List players = isLoading + ? skeletonData + : (snapshot.data ?? []); + return Expanded( + child: Skeletonizer( + effect: PulseEffect( + from: Colors.grey[800]!, + to: Colors.grey[600]!, + duration: const Duration(milliseconds: 800), + ), + enabled: isLoading, + enableSwitchAnimation: true, + switchAnimationConfig: + const SwitchAnimationConfig( + duration: Duration(milliseconds: 200), + switchInCurve: Curves.linear, + switchOutCurve: Curves.linear, + transitionBuilder: AnimatedSwitcher + .defaultTransitionBuilder, + layoutBuilder: + AnimatedSwitcher.defaultLayoutBuilder, + ), + child: ListView.builder( + itemCount: players.length, + itemBuilder: + (BuildContext context, int index) { + return Container( + margin: const EdgeInsets.symmetric( + horizontal: 5, + vertical: 5, + ), + padding: const EdgeInsets.symmetric( + horizontal: 10, + ), + decoration: BoxDecoration( + color: CustomTheme.boxColor, + border: Border.all( + color: CustomTheme.boxBorder, + ), + borderRadius: BorderRadius.circular( + 12, + ), + ), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.max, + children: [ + Text( + players[index].name, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w500, + ), + ), + IconButton( + icon: Icon(Icons.add, size: 20), + onPressed: () {}, + ), + ], + ), + ); //GroupTile(group: groups[index]); + }, + ), + ), + ); + }, + ), + ], + ), + ), + ), + FullWidthButton( + text: "Create group", + infillColor: CustomTheme.primaryColor, + borderColor: CustomTheme.primaryColor, + sizeRelativeToWidth: 0.95, + onPressed: () {}, + ), + SizedBox(height: 10), + FullWidthButton( + text: "Cancel", + infillColor: CustomTheme.boxColor, + borderColor: CustomTheme.primaryColor, + sizeRelativeToWidth: 0.95, + onPressed: () { + Navigator.pop(context); + }, + ), + SizedBox(height: 20), + ], + ), + ), + ); + } + + Future addSamplePlayers(BuildContext context) async { + final db = Provider.of(context, listen: false); + final playerCount = await db.playerDao.getPlayerCount(); + if (playerCount == 0) { + for (int i = 1; i <= 10; i++) { + final player = Player(id: '$i', name: 'Spieler $i'); + await db.playerDao.addPlayer(player: player); + } + print("10 Beispiel-Spieler wurden zur Datenbank hinzugefügt."); + final players = await db.playerDao.getAllPlayers(); + for (int i = 0; i < players.length; i++) { + print(players[i]); + } + } + } +} From e4de8fdb253906e14723e955ec01aa9fd7df358c Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 17 Nov 2025 13:11:47 +0100 Subject: [PATCH 03/89] added missing attributes for FullWidthButton in groups view --- .../views/main_menu/groups_view.dart | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/presentation/views/main_menu/groups_view.dart b/lib/presentation/views/main_menu/groups_view.dart index 7f1f32d..7c5e3d5 100644 --- a/lib/presentation/views/main_menu/groups_view.dart +++ b/lib/presentation/views/main_menu/groups_view.dart @@ -3,6 +3,7 @@ import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/player.dart'; +import 'package:game_tracker/presentation/views/main_menu/create_group/create_group_view.dart'; import 'package:game_tracker/presentation/widgets/full_width_button.dart'; import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart'; import 'package:game_tracker/presentation/widgets/top_centered_message.dart'; @@ -103,7 +104,22 @@ class _GroupsViewState extends State { Positioned( bottom: 80, - child: FullWidthButton(text: 'Create Group', onPressed: () {}), + child: FullWidthButton( + text: 'Create Group', + infillColor: CustomTheme.primaryColor, + borderColor: CustomTheme.primaryColor, + sizeRelativeToWidth: 0.90, + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) { + return const CreateGroupView(); + }, + ), + ); + }, + ), ), ], ), From 47bb090e725be017e0a8e252c35e25b26b6e9ef2 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 17 Nov 2025 18:23:07 +0100 Subject: [PATCH 04/89] added option to choose disabledBackgroundColor in FullWidthButton --- lib/presentation/widgets/full_width_button.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/presentation/widgets/full_width_button.dart b/lib/presentation/widgets/full_width_button.dart index fc2ca78..fe9913c 100644 --- a/lib/presentation/widgets/full_width_button.dart +++ b/lib/presentation/widgets/full_width_button.dart @@ -6,6 +6,7 @@ class FullWidthButton extends StatelessWidget { required this.text, required this.borderColor, required this.infillColor, + this.disabledInfillColor, required this.sizeRelativeToWidth, required this.onPressed, }); @@ -13,6 +14,7 @@ class FullWidthButton extends StatelessWidget { final String text; final Color borderColor; final Color infillColor; + final Color? disabledInfillColor; final double sizeRelativeToWidth; final VoidCallback? onPressed; @@ -21,6 +23,7 @@ class FullWidthButton extends StatelessWidget { return ElevatedButton( onPressed: onPressed, style: ElevatedButton.styleFrom( + disabledBackgroundColor: disabledInfillColor, minimumSize: Size( MediaQuery.sizeOf(context).width * sizeRelativeToWidth, 60, From 35f2f8754ae7d2b4f6644e8cf0e34035fd8663e1 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 17 Nov 2025 18:24:30 +0100 Subject: [PATCH 05/89] added functionality to create group --- .../create_group/create_group_view.dart | 197 +++++++++++++----- 1 file changed, 142 insertions(+), 55 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart index 63daf62..13f1b7c 100644 --- a/lib/presentation/views/main_menu/create_group/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group/create_group_view.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/player.dart'; import 'package:game_tracker/presentation/widgets/full_width_button.dart'; import 'package:game_tracker/presentation/widgets/top_centered_message.dart'; @@ -15,24 +16,30 @@ class CreateGroupView extends StatefulWidget { } class _CreateGroupViewState extends State { - List selectedPlayers = [ - Player(id: '0', name: 'Player 0'), - Player(id: '0', name: 'Player 0'), - Player(id: '0', name: 'Player 0'), - Player(id: '0', name: 'Player 0'), - ]; + List selectedPlayers = []; + List suggestedPlayers = []; + List allPlayers = []; + late final AppDatabase db; late Future> _allPlayersFuture; late final List skeletonData = List.filled( 7, Player(id: '0', name: 'Player 0'), ); + final _groupNameController = TextEditingController(); + final _searchBarController = TextEditingController(); @override @override void initState() { super.initState(); - final db = Provider.of(context, listen: false); + db = Provider.of(context, listen: false); _allPlayersFuture = db.playerDao.getAllPlayers(); + _allPlayersFuture.then((loadedPlayers) { + setState(() { + allPlayers = loadedPlayers; + suggestedPlayers = loadedPlayers; + }); + }); } @override @@ -55,6 +62,10 @@ class _CreateGroupViewState extends State { Container( margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), child: TextField( + controller: _groupNameController, + onChanged: (value) { + setState(() {}); + }, decoration: InputDecoration( filled: true, fillColor: CustomTheme.boxColor, @@ -90,6 +101,7 @@ class _CreateGroupViewState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ SearchBar( + controller: _searchBarController, constraints: BoxConstraints(maxHeight: 45, minHeight: 45), hintText: "Search for players", hintStyle: WidgetStateProperty.all( @@ -107,10 +119,23 @@ class _CreateGroupViewState extends State { borderRadius: BorderRadius.circular(12), ), ), + onChanged: (value) { + setState(() { + if (value.isEmpty) { + suggestedPlayers = allPlayers; + } else { + suggestedPlayers = allPlayers.where((player) { + return player.name.toLowerCase().contains( + value.toLowerCase(), + ); + }).toList(); + } + }); + }, ), SizedBox(height: 10), Text( - "Ausgewählte Spieler: (X)", + "Ausgewählte Spieler: (${selectedPlayers.length})", style: TextStyle( fontSize: 16, fontWeight: FontWeight.bold, @@ -123,7 +148,7 @@ class _CreateGroupViewState extends State { spacing: 8.0, runSpacing: 8.0, children: [ - for (var player in selectedPlayers) + for (var selectedPlayer in selectedPlayers) Container( padding: EdgeInsets.all(5), decoration: BoxDecoration( @@ -136,7 +161,7 @@ class _CreateGroupViewState extends State { children: [ SizedBox(width: 12), Text( - player.name, + selectedPlayer.name, style: const TextStyle( fontSize: 14, fontWeight: FontWeight.w500, @@ -147,7 +172,7 @@ class _CreateGroupViewState extends State { child: const Icon(Icons.close, size: 20), onTap: () { setState(() { - selectedPlayers.remove(player); + selectedPlayers.remove(selectedPlayer); }); }, ), @@ -183,7 +208,10 @@ class _CreateGroupViewState extends State { } if (snapshot.connectionState == ConnectionState.done && - (!snapshot.hasData || snapshot.data!.isEmpty)) { + (!snapshot.hasData || + snapshot.data!.isEmpty || + (suggestedPlayers.isEmpty && + allPlayers.isEmpty))) { return const Center( child: TopCenteredMessage( icon: Icons.info, @@ -195,9 +223,6 @@ class _CreateGroupViewState extends State { final bool isLoading = snapshot.connectionState == ConnectionState.waiting; - final List players = isLoading - ? skeletonData - : (snapshot.data ?? []); return Expanded( child: Skeletonizer( effect: PulseEffect( @@ -217,48 +242,69 @@ class _CreateGroupViewState extends State { layoutBuilder: AnimatedSwitcher.defaultLayoutBuilder, ), - child: ListView.builder( - itemCount: players.length, - itemBuilder: - (BuildContext context, int index) { - return Container( - margin: const EdgeInsets.symmetric( - horizontal: 5, - vertical: 5, - ), - padding: const EdgeInsets.symmetric( - horizontal: 10, - ), - decoration: BoxDecoration( - color: CustomTheme.boxColor, - border: Border.all( - color: CustomTheme.boxBorder, + child: + (suggestedPlayers.isEmpty && + !allPlayers.isEmpty) + ? TopCenteredMessage( + icon: Icons.info, + title: 'Info', + message: + 'No players found with that name.', + ) + : ListView.builder( + itemCount: suggestedPlayers.length, + itemBuilder: (BuildContext context, int index) { + return Container( + margin: const EdgeInsets.symmetric( + horizontal: 5, + vertical: 5, ), - borderRadius: BorderRadius.circular( - 12, + padding: const EdgeInsets.symmetric( + horizontal: 10, ), - ), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - mainAxisSize: MainAxisSize.max, - children: [ - Text( - players[index].name, - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, + decoration: BoxDecoration( + color: CustomTheme.boxColor, + border: Border.all( + color: CustomTheme.boxBorder, + ), + borderRadius: + BorderRadius.circular(12), + ), + child: Row( + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + mainAxisSize: MainAxisSize.max, + children: [ + Text( + suggestedPlayers[index].name, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w500, + ), ), - ), - IconButton( - icon: Icon(Icons.add, size: 20), - onPressed: () {}, - ), - ], - ), - ); //GroupTile(group: groups[index]); - }, - ), + IconButton( + icon: Icon( + Icons.add, + size: 20, + ), + onPressed: () { + setState(() { + if (!selectedPlayers.contains( + suggestedPlayers[index], + )) { + selectedPlayers.add( + suggestedPlayers[index], + ); + } + }); + }, + ), + ], + ), + ); + }, + ), ), ); }, @@ -271,14 +317,39 @@ class _CreateGroupViewState extends State { text: "Create group", infillColor: CustomTheme.primaryColor, borderColor: CustomTheme.primaryColor, + disabledInfillColor: CustomTheme.boxColor, sizeRelativeToWidth: 0.95, - onPressed: () {}, + onPressed: + (_groupNameController.text.isEmpty || selectedPlayers.isEmpty) + ? null + : () { + String id = "ID_" + _groupNameController.text; + String name = _groupNameController.text; + List members = selectedPlayers; + db.groupDao.addGroup( + group: Group(id: id, name: name, members: members), + ); + print(name); + print(id); + for (int i = 0; i < members.length; i++) { + print(members[i].name); + print(members[i].id); + } + if (true) { + //eigentlich wenn create group erfolgreich + _groupNameController.clear(); + _searchBarController.clear(); + selectedPlayers.clear(); + } + setState(() {}); + }, ), SizedBox(height: 10), FullWidthButton( text: "Cancel", infillColor: CustomTheme.boxColor, borderColor: CustomTheme.primaryColor, + disabledInfillColor: CustomTheme.boxColor, sizeRelativeToWidth: 0.95, onPressed: () { Navigator.pop(context); @@ -293,6 +364,22 @@ class _CreateGroupViewState extends State { Future addSamplePlayers(BuildContext context) async { final db = Provider.of(context, listen: false); + /*await db.groupDao.addGroup( + group: Group( + id: "dg1", + name: "Debug Gruppe 1", + members: [ + Player(id: '1', name: 'Spieler 1'), + Player(id: '2', name: 'Spieler 2'), + Player(id: '3', name: 'Spieler 3'), + ], + ), + ); + final group = await db.groupDao.getGroupById(groupId: "dg1"); + print(group.name); + print(group.id); + print(group.members.length); + */ final playerCount = await db.playerDao.getPlayerCount(); if (playerCount == 0) { for (int i = 1; i <= 10; i++) { From a7f6a53b9ccc20a21b64414b3dd7ef707b085671 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 17 Nov 2025 19:00:38 +0100 Subject: [PATCH 06/89] removed double @override --- .../views/main_menu/create_group/create_group_view.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart index 13f1b7c..631f3ae 100644 --- a/lib/presentation/views/main_menu/create_group/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group/create_group_view.dart @@ -28,7 +28,6 @@ class _CreateGroupViewState extends State { final _groupNameController = TextEditingController(); final _searchBarController = TextEditingController(); - @override @override void initState() { super.initState(); From f8b6c00d5d8f1ceaa67f3862f1d379e2241a327b Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Mon, 17 Nov 2025 19:26:36 +0100 Subject: [PATCH 07/89] Fixed return --- lib/data/dao/group_dao.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/data/dao/group_dao.dart b/lib/data/dao/group_dao.dart index 8eb3a1a..cc680a3 100644 --- a/lib/data/dao/group_dao.dart +++ b/lib/data/dao/group_dao.dart @@ -60,8 +60,8 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { await Future.wait( group.members.map((player) => db.playerDao.addPlayer(player: player)), ); - return true; }); + return true; } return false; } From 6b2fb18ec095b3feeffe344f7ecdd9caabf4faa1 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 17 Nov 2025 20:20:56 +0100 Subject: [PATCH 08/89] fixed groups not getting added & added feature to remove player from all players when selected --- .../create_group/create_group_view.dart | 67 +++++++++---------- 1 file changed, 30 insertions(+), 37 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart index 631f3ae..b27fb6a 100644 --- a/lib/presentation/views/main_menu/create_group/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group/create_group_view.dart @@ -35,6 +35,7 @@ class _CreateGroupViewState extends State { _allPlayersFuture = db.playerDao.getAllPlayers(); _allPlayersFuture.then((loadedPlayers) { setState(() { + loadedPlayers.sort((a, b) => a.name.compareTo(b.name)); allPlayers = loadedPlayers; suggestedPlayers = loadedPlayers; }); @@ -171,7 +172,11 @@ class _CreateGroupViewState extends State { child: const Icon(Icons.close, size: 20), onTap: () { setState(() { + suggestedPlayers.add(selectedPlayer); selectedPlayers.remove(selectedPlayer); + suggestedPlayers.sort( + (a, b) => a.name.compareTo(b.name), + ); }); }, ), @@ -295,6 +300,15 @@ class _CreateGroupViewState extends State { selectedPlayers.add( suggestedPlayers[index], ); + selectedPlayers.sort( + (a, b) => + a.name.compareTo( + b.name, + ), + ); + suggestedPlayers.remove( + suggestedPlayers[index], + ); } }); }, @@ -321,39 +335,34 @@ class _CreateGroupViewState extends State { onPressed: (_groupNameController.text.isEmpty || selectedPlayers.isEmpty) ? null - : () { + : () async { String id = "ID_" + _groupNameController.text; String name = _groupNameController.text; List members = selectedPlayers; - db.groupDao.addGroup( + bool success = await db.groupDao.addGroup( group: Group(id: id, name: name, members: members), ); - print(name); - print(id); - for (int i = 0; i < members.length; i++) { - print(members[i].name); - print(members[i].id); - } - if (true) { - //eigentlich wenn create group erfolgreich + if (success) { _groupNameController.clear(); _searchBarController.clear(); selectedPlayers.clear(); + Navigator.pop(context); + } else { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + backgroundColor: CustomTheme.boxColor, + content: Center( + child: Text( + "Error while creating group, please try again", + style: TextStyle(color: Colors.white), + ), + ), + ), + ); } setState(() {}); }, ), - SizedBox(height: 10), - FullWidthButton( - text: "Cancel", - infillColor: CustomTheme.boxColor, - borderColor: CustomTheme.primaryColor, - disabledInfillColor: CustomTheme.boxColor, - sizeRelativeToWidth: 0.95, - onPressed: () { - Navigator.pop(context); - }, - ), SizedBox(height: 20), ], ), @@ -363,22 +372,6 @@ class _CreateGroupViewState extends State { Future addSamplePlayers(BuildContext context) async { final db = Provider.of(context, listen: false); - /*await db.groupDao.addGroup( - group: Group( - id: "dg1", - name: "Debug Gruppe 1", - members: [ - Player(id: '1', name: 'Spieler 1'), - Player(id: '2', name: 'Spieler 2'), - Player(id: '3', name: 'Spieler 3'), - ], - ), - ); - final group = await db.groupDao.getGroupById(groupId: "dg1"); - print(group.name); - print(group.id); - print(group.members.length); - */ final playerCount = await db.playerDao.getPlayerCount(); if (playerCount == 0) { for (int i = 1; i <= 10; i++) { From c3a2ac77b0de0918a3d38c6cc72ded946de6d08d Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 17 Nov 2025 21:19:17 +0100 Subject: [PATCH 09/89] fixed color change in appbar when scrolling --- .../views/main_menu/create_group/create_group_view.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart index b27fb6a..316f2d3 100644 --- a/lib/presentation/views/main_menu/create_group/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group/create_group_view.dart @@ -50,6 +50,7 @@ class _CreateGroupViewState extends State { backgroundColor: CustomTheme.backgroundColor, appBar: AppBar( backgroundColor: CustomTheme.backgroundColor, + scrolledUnderElevation: 0, title: const Text( "Create new group", style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold), From 3e89bfd641e5245264a5250fa7b320cb5072b127 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 17 Nov 2025 21:34:51 +0100 Subject: [PATCH 10/89] added info message for when all players are selected --- .../create_group/create_group_view.dart | 241 +++++++++--------- 1 file changed, 116 insertions(+), 125 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart index 316f2d3..907671b 100644 --- a/lib/presentation/views/main_menu/create_group/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group/create_group_view.dart @@ -36,8 +36,8 @@ class _CreateGroupViewState extends State { _allPlayersFuture.then((loadedPlayers) { setState(() { loadedPlayers.sort((a, b) => a.name.compareTo(b.name)); - allPlayers = loadedPlayers; - suggestedPlayers = loadedPlayers; + allPlayers = [...loadedPlayers]; + suggestedPlayers = [...loadedPlayers]; }); }); } @@ -123,7 +123,7 @@ class _CreateGroupViewState extends State { onChanged: (value) { setState(() { if (value.isEmpty) { - suggestedPlayers = allPlayers; + suggestedPlayers = [...allPlayers]; } else { suggestedPlayers = allPlayers.where((player) { return player.name.toLowerCase().contains( @@ -197,131 +197,122 @@ class _CreateGroupViewState extends State { SizedBox(height: 10), FutureBuilder( future: _allPlayersFuture, - builder: - ( - BuildContext context, - AsyncSnapshot> snapshot, - ) { - if (snapshot.hasError) { - return const Center( - child: TopCenteredMessage( - icon: Icons.report, - title: 'Error', - message: 'Player data couldn\'t\nbe loaded.', - ), - ); - } - if (snapshot.connectionState == - ConnectionState.done && - (!snapshot.hasData || - snapshot.data!.isEmpty || - (suggestedPlayers.isEmpty && - allPlayers.isEmpty))) { - return const Center( - child: TopCenteredMessage( - icon: Icons.info, - title: 'Info', - message: 'No players created yet.', - ), - ); - } - final bool isLoading = - snapshot.connectionState == - ConnectionState.waiting; - return Expanded( - child: Skeletonizer( - effect: PulseEffect( - from: Colors.grey[800]!, - to: Colors.grey[600]!, - duration: const Duration(milliseconds: 800), - ), - enabled: isLoading, - enableSwitchAnimation: true, - switchAnimationConfig: - const SwitchAnimationConfig( - duration: Duration(milliseconds: 200), - switchInCurve: Curves.linear, - switchOutCurve: Curves.linear, - transitionBuilder: AnimatedSwitcher - .defaultTransitionBuilder, - layoutBuilder: - AnimatedSwitcher.defaultLayoutBuilder, - ), - child: - (suggestedPlayers.isEmpty && - !allPlayers.isEmpty) - ? TopCenteredMessage( - icon: Icons.info, - title: 'Info', - message: - 'No players found with that name.', - ) - : ListView.builder( - itemCount: suggestedPlayers.length, - itemBuilder: (BuildContext context, int index) { - return Container( - margin: const EdgeInsets.symmetric( - horizontal: 5, - vertical: 5, - ), - padding: const EdgeInsets.symmetric( - horizontal: 10, - ), - decoration: BoxDecoration( - color: CustomTheme.boxColor, - border: Border.all( - color: CustomTheme.boxBorder, + builder: (BuildContext context, AsyncSnapshot> snapshot) { + if (snapshot.hasError) { + return const Center( + child: TopCenteredMessage( + icon: Icons.report, + title: 'Error', + message: 'Player data couldn\'t\nbe loaded.', + ), + ); + } + if (snapshot.connectionState == ConnectionState.done && + (!snapshot.hasData || + snapshot.data!.isEmpty || + (selectedPlayers.isEmpty && + allPlayers.isEmpty))) { + return const Center( + child: TopCenteredMessage( + icon: Icons.info, + title: 'Info', + message: 'No players created yet.', + ), + ); + } + final bool isLoading = + snapshot.connectionState == ConnectionState.waiting; + return Expanded( + child: Skeletonizer( + effect: PulseEffect( + from: Colors.grey[800]!, + to: Colors.grey[600]!, + duration: const Duration(milliseconds: 800), + ), + enabled: isLoading, + enableSwitchAnimation: true, + switchAnimationConfig: const SwitchAnimationConfig( + duration: Duration(milliseconds: 200), + switchInCurve: Curves.linear, + switchOutCurve: Curves.linear, + transitionBuilder: + AnimatedSwitcher.defaultTransitionBuilder, + layoutBuilder: + AnimatedSwitcher.defaultLayoutBuilder, + ), + child: + (suggestedPlayers.isEmpty && + !allPlayers.isEmpty) + ? TopCenteredMessage( + icon: Icons.info, + title: 'Info', + message: + (selectedPlayers.length == + allPlayers.length) + ? 'No more players to add.' + : 'No players found with that name.', + ) + : ListView.builder( + itemCount: suggestedPlayers.length, + itemBuilder: (BuildContext context, int index) { + return Container( + margin: const EdgeInsets.symmetric( + horizontal: 5, + vertical: 5, + ), + padding: const EdgeInsets.symmetric( + horizontal: 10, + ), + decoration: BoxDecoration( + color: CustomTheme.boxColor, + border: Border.all( + color: CustomTheme.boxBorder, + ), + borderRadius: BorderRadius.circular( + 12, + ), + ), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.max, + children: [ + Text( + suggestedPlayers[index].name, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w500, ), - borderRadius: - BorderRadius.circular(12), ), - child: Row( - mainAxisAlignment: - MainAxisAlignment - .spaceBetween, - mainAxisSize: MainAxisSize.max, - children: [ - Text( - suggestedPlayers[index].name, - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - ), - ), - IconButton( - icon: Icon( - Icons.add, - size: 20, - ), - onPressed: () { - setState(() { - if (!selectedPlayers.contains( - suggestedPlayers[index], - )) { - selectedPlayers.add( - suggestedPlayers[index], - ); - selectedPlayers.sort( - (a, b) => - a.name.compareTo( - b.name, - ), - ); - suggestedPlayers.remove( - suggestedPlayers[index], - ); - } - }); - }, - ), - ], + IconButton( + icon: Icon(Icons.add, size: 20), + onPressed: () { + setState(() { + if (!selectedPlayers.contains( + suggestedPlayers[index], + )) { + selectedPlayers.add( + suggestedPlayers[index], + ); + selectedPlayers.sort( + (a, b) => a.name + .compareTo(b.name), + ); + suggestedPlayers.remove( + suggestedPlayers[index], + ); + } + }); + }, ), - ); - }, - ), - ), - ); - }, + ], + ), + ); + }, + ), + ), + ); + }, ), ], ), From c31d757615547a89344387c8eca2324898970b15 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 17:00:09 +0100 Subject: [PATCH 11/89] fixed renderoverflow for long player & group names in create group view and group view --- .../create_group/create_group_view.dart | 32 +++++++++++------ .../widgets/tiles/group_tile.dart | 36 +++++++++++-------- 2 files changed, 42 insertions(+), 26 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart index 907671b..823b6ff 100644 --- a/lib/presentation/views/main_menu/create_group/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group/create_group_view.dart @@ -70,7 +70,11 @@ class _CreateGroupViewState extends State { decoration: InputDecoration( filled: true, fillColor: CustomTheme.boxColor, - hint: Text("Group name", style: TextStyle(fontSize: 18)), + hint: Text( + "Group name", + overflow: TextOverflow.ellipsis, + style: TextStyle(fontSize: 18), + ), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(12)), borderSide: BorderSide(color: CustomTheme.boxBorder), @@ -161,11 +165,14 @@ class _CreateGroupViewState extends State { mainAxisSize: MainAxisSize.min, children: [ SizedBox(width: 12), - Text( - selectedPlayer.name, - style: const TextStyle( - fontSize: 14, - fontWeight: FontWeight.w500, + Flexible( + child: Text( + selectedPlayer.name, + overflow: TextOverflow.ellipsis, + style: const TextStyle( + fontSize: 14, + fontWeight: FontWeight.w500, + ), ), ), SizedBox(width: 3), @@ -277,11 +284,14 @@ class _CreateGroupViewState extends State { MainAxisAlignment.spaceBetween, mainAxisSize: MainAxisSize.max, children: [ - Text( - suggestedPlayers[index].name, - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, + Flexible( + child: Text( + suggestedPlayers[index].name, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w500, + ), ), ), IconButton( diff --git a/lib/presentation/widgets/tiles/group_tile.dart b/lib/presentation/widgets/tiles/group_tile.dart index 448c68c..12d016e 100644 --- a/lib/presentation/widgets/tiles/group_tile.dart +++ b/lib/presentation/widgets/tiles/group_tile.dart @@ -24,24 +24,29 @@ class GroupTile extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text( - group.name, - overflow: TextOverflow.ellipsis, - style: const TextStyle( - fontWeight: FontWeight.bold, - fontSize: 18, + Flexible( + child: Text( + group.name, + overflow: TextOverflow.ellipsis, + style: const TextStyle( + fontWeight: FontWeight.bold, + fontSize: 18, + ), ), ), - const Spacer(), - Text( - '${group.members.length}', - style: const TextStyle( - fontWeight: FontWeight.w900, - fontSize: 18, - ), + Row( + children: [ + Text( + '${group.members.length}', + style: const TextStyle( + fontWeight: FontWeight.w900, + fontSize: 18, + ), + ), + const SizedBox(width: 3), + const Icon(Icons.group, size: 22), + ], ), - const SizedBox(width: 3), - const Icon(Icons.group, size: 22), ], ), const SizedBox(height: 5), @@ -64,6 +69,7 @@ class GroupTile extends StatelessWidget { child: Skeleton.ignore( child: Text( member.name, + overflow: TextOverflow.ellipsis, style: const TextStyle( fontSize: 14, fontWeight: FontWeight.bold, From 412d1fd334b5475f5f1fd4f02c9ab5c7c6d639f8 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 17:08:07 +0100 Subject: [PATCH 12/89] fixed search bugs where duplicates where created or search results were wrong --- .../create_group/create_group_view.dart | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart index 823b6ff..87ef5bc 100644 --- a/lib/presentation/views/main_menu/create_group/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group/create_group_view.dart @@ -130,9 +130,12 @@ class _CreateGroupViewState extends State { suggestedPlayers = [...allPlayers]; } else { suggestedPlayers = allPlayers.where((player) { - return player.name.toLowerCase().contains( - value.toLowerCase(), - ); + final bool nameMatches = player.name + .toLowerCase() + .contains(value.toLowerCase()); + final bool isNotSelected = !selectedPlayers + .contains(player); + return nameMatches && isNotSelected; }).toList(); } }); @@ -180,11 +183,19 @@ class _CreateGroupViewState extends State { child: const Icon(Icons.close, size: 20), onTap: () { setState(() { - suggestedPlayers.add(selectedPlayer); + final currentSearch = _searchBarController + .text + .toLowerCase(); selectedPlayers.remove(selectedPlayer); - suggestedPlayers.sort( - (a, b) => a.name.compareTo(b.name), - ); + if (currentSearch.isEmpty || + selectedPlayer.name + .toLowerCase() + .contains(currentSearch)) { + suggestedPlayers.add(selectedPlayer); + suggestedPlayers.sort( + (a, b) => a.name.compareTo(b.name), + ); + } }); }, ), From a5e508dbdaedb2e22039f0015de786d2e85b5a84 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 17:29:24 +0100 Subject: [PATCH 13/89] Refresh group list after adding a new group --- lib/presentation/views/main_menu/groups_view.dart | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/presentation/views/main_menu/groups_view.dart b/lib/presentation/views/main_menu/groups_view.dart index 7c5e3d5..bdb3d4a 100644 --- a/lib/presentation/views/main_menu/groups_view.dart +++ b/lib/presentation/views/main_menu/groups_view.dart @@ -19,6 +19,7 @@ class GroupsView extends StatefulWidget { class _GroupsViewState extends State { late Future> _allGroupsFuture; + late final AppDatabase db; final player = Player(id: 'p1', name: 'Sample'); late final List skeletonData = List.filled( @@ -33,7 +34,7 @@ class _GroupsViewState extends State { @override void initState() { super.initState(); - final db = Provider.of(context, listen: false); + db = Provider.of(context, listen: false); _allGroupsFuture = db.groupDao.getAllGroups(); } @@ -109,8 +110,8 @@ class _GroupsViewState extends State { infillColor: CustomTheme.primaryColor, borderColor: CustomTheme.primaryColor, sizeRelativeToWidth: 0.90, - onPressed: () { - Navigator.push( + onPressed: () async { + await Navigator.push( context, MaterialPageRoute( builder: (context) { @@ -118,6 +119,9 @@ class _GroupsViewState extends State { }, ), ); + setState(() { + _allGroupsFuture = db.groupDao.getAllGroups(); + }); }, ), ), From 05c41707ca96f997f3608fc1206fc8e22913abda Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 17:34:09 +0100 Subject: [PATCH 14/89] Refactor: Remove sample player generation code --- .../create_group/create_group_view.dart | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart index 87ef5bc..1f616a2 100644 --- a/lib/presentation/views/main_menu/create_group/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group/create_group_view.dart @@ -44,7 +44,6 @@ class _CreateGroupViewState extends State { @override Widget build(BuildContext context) { - addSamplePlayers(context); return SafeArea( child: Scaffold( backgroundColor: CustomTheme.backgroundColor, @@ -382,20 +381,4 @@ class _CreateGroupViewState extends State { ), ); } - - Future addSamplePlayers(BuildContext context) async { - final db = Provider.of(context, listen: false); - final playerCount = await db.playerDao.getPlayerCount(); - if (playerCount == 0) { - for (int i = 1; i <= 10; i++) { - final player = Player(id: '$i', name: 'Spieler $i'); - await db.playerDao.addPlayer(player: player); - } - print("10 Beispiel-Spieler wurden zur Datenbank hinzugefügt."); - final players = await db.playerDao.getAllPlayers(); - for (int i = 0; i < players.length; i++) { - print(players[i]); - } - } - } } From 1882d0007bd42daadec4f95bd749640203dcdf88 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 20:09:57 +0100 Subject: [PATCH 15/89] created widgets for search bar list tile, selected tile and text input field in create groups view --- .../widgets/custom_search_bar.dart | 36 +++++++++++++++ .../widgets/text_input_field.dart | 38 ++++++++++++++++ .../widgets/tiles/text_icon_list_tile.dart | 42 ++++++++++++++++++ .../widgets/tiles/text_icon_tile.dart | 44 +++++++++++++++++++ 4 files changed, 160 insertions(+) create mode 100644 lib/presentation/widgets/custom_search_bar.dart create mode 100644 lib/presentation/widgets/text_input_field.dart create mode 100644 lib/presentation/widgets/tiles/text_icon_list_tile.dart create mode 100644 lib/presentation/widgets/tiles/text_icon_tile.dart diff --git a/lib/presentation/widgets/custom_search_bar.dart b/lib/presentation/widgets/custom_search_bar.dart new file mode 100644 index 0000000..d0f66e8 --- /dev/null +++ b/lib/presentation/widgets/custom_search_bar.dart @@ -0,0 +1,36 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; + +class CustomSearchBar extends StatelessWidget { + final TextEditingController controller; + final String hintText; + final ValueChanged? onChanged; + final BoxConstraints? constraints; + + const CustomSearchBar({ + super.key, + required this.controller, + required this.hintText, + this.onChanged, + this.constraints, + }); + + @override + Widget build(BuildContext context) { + return SearchBar( + controller: controller, + constraints: + constraints ?? const BoxConstraints(maxHeight: 45, minHeight: 45), + hintText: hintText, + onChanged: onChanged, + hintStyle: MaterialStateProperty.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( + RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), + ), + elevation: MaterialStateProperty.all(0), + ); + } +} diff --git a/lib/presentation/widgets/text_input_field.dart b/lib/presentation/widgets/text_input_field.dart new file mode 100644 index 0000000..6cd9d75 --- /dev/null +++ b/lib/presentation/widgets/text_input_field.dart @@ -0,0 +1,38 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; + +class TextInputField extends StatelessWidget { + final TextEditingController controller; + final ValueChanged? onChanged; + final String hintText; + + const TextInputField({ + super.key, + required this.controller, + required this.hintText, + this.onChanged, + }); + + @override + Widget build(BuildContext context) { + return TextField( + controller: controller, + onChanged: onChanged, + decoration: InputDecoration( + filled: true, + fillColor: CustomTheme.boxColor, + hintText: hintText, + hintStyle: const TextStyle(fontSize: 18), + enabledBorder: OutlineInputBorder( + borderRadius: const BorderRadius.all(Radius.circular(12)), + borderSide: BorderSide(color: CustomTheme.boxBorder), + ), + focusedBorder: OutlineInputBorder( + borderRadius: const BorderRadius.all(Radius.circular(12)), + borderSide: BorderSide(color: CustomTheme.boxBorder), + ), + floatingLabelBehavior: FloatingLabelBehavior.never, + ), + ); + } +} diff --git a/lib/presentation/widgets/tiles/text_icon_list_tile.dart b/lib/presentation/widgets/tiles/text_icon_list_tile.dart new file mode 100644 index 0000000..b32504f --- /dev/null +++ b/lib/presentation/widgets/tiles/text_icon_list_tile.dart @@ -0,0 +1,42 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; + +class IconListTile extends StatelessWidget { + final String text; + final IconData icon; + final VoidCallback onPressed; + + const IconListTile({ + super.key, + required this.text, + required this.icon, + required this.onPressed, + }); + + @override + Widget build(BuildContext context) { + return Container( + margin: const EdgeInsets.symmetric(horizontal: 5, vertical: 5), + padding: const EdgeInsets.symmetric(horizontal: 10), + decoration: BoxDecoration( + color: CustomTheme.boxColor, + border: Border.all(color: CustomTheme.boxBorder), + borderRadius: BorderRadius.circular(12), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.max, + children: [ + Flexible( + child: Text( + text, + overflow: TextOverflow.ellipsis, + style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w500), + ), + ), + IconButton(icon: Icon(icon, size: 20), onPressed: onPressed), + ], + ), + ); + } +} diff --git a/lib/presentation/widgets/tiles/text_icon_tile.dart b/lib/presentation/widgets/tiles/text_icon_tile.dart new file mode 100644 index 0000000..52174bd --- /dev/null +++ b/lib/presentation/widgets/tiles/text_icon_tile.dart @@ -0,0 +1,44 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; + +class TextIconTile extends StatelessWidget { + final String text; + final IconData? icon; + final VoidCallback? onIconTap; + + const TextIconTile({ + super.key, + required this.text, + this.icon, + this.onIconTap, + }); + + @override + Widget build(BuildContext context) { + return Container( + padding: const EdgeInsets.all(5), + decoration: BoxDecoration( + color: CustomTheme.onBoxColor, + borderRadius: BorderRadius.circular(12), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.min, + children: [ + if (icon != null) const SizedBox(width: 3), + Flexible( + child: Text( + text, + overflow: TextOverflow.ellipsis, + style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500), + ), + ), + if (icon != null) ...[ + const SizedBox(width: 3), + GestureDetector(onTap: onIconTap, child: Icon(icon, size: 20)), + ], + ], + ), + ); + } +} From 8f9289617f63b4f66d5131a4f9e8e61df8f2c0ac Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 20:10:26 +0100 Subject: [PATCH 16/89] changed group tile to use standardized text icon tile --- .../widgets/tiles/group_tile.dart | 24 ++----------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/lib/presentation/widgets/tiles/group_tile.dart b/lib/presentation/widgets/tiles/group_tile.dart index 12d016e..d87cc12 100644 --- a/lib/presentation/widgets/tiles/group_tile.dart +++ b/lib/presentation/widgets/tiles/group_tile.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/dto/group.dart'; -import 'package:skeletonizer/skeletonizer.dart'; +import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart'; class GroupTile extends StatelessWidget { const GroupTile({super.key, required this.group}); @@ -56,27 +56,7 @@ class GroupTile extends StatelessWidget { spacing: 12.0, runSpacing: 8.0, children: [ - for (var member in group.members) - Container( - padding: const EdgeInsets.symmetric( - vertical: 5, - horizontal: 10, - ), - decoration: BoxDecoration( - color: CustomTheme.onBoxColor, - borderRadius: BorderRadius.circular(12), - ), - child: Skeleton.ignore( - child: Text( - member.name, - overflow: TextOverflow.ellipsis, - style: const TextStyle( - fontSize: 14, - fontWeight: FontWeight.bold, - ), - ), - ), - ), + for (var member in group.members) TextIconTile(text: member.name), ], ), const SizedBox(height: 2.5), From 77812842893db5d4c122761d5a74580331dc1639 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 20:10:48 +0100 Subject: [PATCH 17/89] changed to use standardized tiles and fixed search bug --- .../create_group/create_group_view.dart | 330 +++++++----------- 1 file changed, 128 insertions(+), 202 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart index 1f616a2..1a84956 100644 --- a/lib/presentation/views/main_menu/create_group/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group/create_group_view.dart @@ -3,10 +3,15 @@ import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/player.dart'; +import 'package:game_tracker/presentation/widgets/custom_search_bar.dart'; import 'package:game_tracker/presentation/widgets/full_width_button.dart'; +import 'package:game_tracker/presentation/widgets/text_input_field.dart'; +import 'package:game_tracker/presentation/widgets/tiles/text_icon_list_tile.dart'; +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}); @@ -61,29 +66,12 @@ class _CreateGroupViewState extends State { children: [ Container( margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), - child: TextField( + child: TextInputField( controller: _groupNameController, + hintText: 'Group name', onChanged: (value) { setState(() {}); }, - decoration: InputDecoration( - filled: true, - fillColor: CustomTheme.boxColor, - hint: Text( - "Group name", - overflow: TextOverflow.ellipsis, - style: TextStyle(fontSize: 18), - ), - enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.all(Radius.circular(12)), - borderSide: BorderSide(color: CustomTheme.boxBorder), - ), - focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.all(Radius.circular(12)), - borderSide: BorderSide(color: CustomTheme.boxBorder), - ), - floatingLabelBehavior: FloatingLabelBehavior.never, - ), ), ), Expanded( @@ -104,29 +92,16 @@ class _CreateGroupViewState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - SearchBar( + CustomSearchBar( controller: _searchBarController, constraints: BoxConstraints(maxHeight: 45, minHeight: 45), hintText: "Search for players", - hintStyle: WidgetStateProperty.all( - TextStyle(fontSize: 16), - ), - leading: Icon(Icons.search), - backgroundColor: WidgetStateProperty.all( - CustomTheme.boxColor, - ), - side: WidgetStateProperty.all( - BorderSide(color: CustomTheme.boxBorder), - ), - shape: WidgetStateProperty.all( - RoundedRectangleBorder( - borderRadius: BorderRadius.circular(12), - ), - ), onChanged: (value) { setState(() { if (value.isEmpty) { - suggestedPlayers = [...allPlayers]; + suggestedPlayers = allPlayers.where((player) { + return !selectedPlayers.contains(player); + }).toList(); } else { suggestedPlayers = allPlayers.where((player) { final bool nameMatches = player.name @@ -156,50 +131,25 @@ class _CreateGroupViewState extends State { runSpacing: 8.0, children: [ for (var selectedPlayer in selectedPlayers) - Container( - padding: EdgeInsets.all(5), - decoration: BoxDecoration( - color: CustomTheme.onBoxColor, - borderRadius: BorderRadius.circular(12), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - mainAxisSize: MainAxisSize.min, - children: [ - SizedBox(width: 12), - Flexible( - child: Text( - selectedPlayer.name, - overflow: TextOverflow.ellipsis, - style: const TextStyle( - fontSize: 14, - fontWeight: FontWeight.w500, - ), - ), - ), - SizedBox(width: 3), - GestureDetector( - child: const Icon(Icons.close, size: 20), - onTap: () { - setState(() { - final currentSearch = _searchBarController - .text - .toLowerCase(); - selectedPlayers.remove(selectedPlayer); - if (currentSearch.isEmpty || - selectedPlayer.name - .toLowerCase() - .contains(currentSearch)) { - suggestedPlayers.add(selectedPlayer); - suggestedPlayers.sort( - (a, b) => a.name.compareTo(b.name), - ); - } - }); - }, - ), - ], - ), + TextIconTile( + text: selectedPlayer.name, + icon: Icons.close, + onIconTap: () { + setState(() { + final currentSearch = _searchBarController.text + .toLowerCase(); + selectedPlayers.remove(selectedPlayer); + if (currentSearch.isEmpty || + selectedPlayer.name.toLowerCase().contains( + currentSearch, + )) { + suggestedPlayers.add(selectedPlayer); + suggestedPlayers.sort( + (a, b) => a.name.compareTo(b.name), + ); + } + }); + }, ), ], ), @@ -214,125 +164,100 @@ class _CreateGroupViewState extends State { SizedBox(height: 10), FutureBuilder( future: _allPlayersFuture, - builder: (BuildContext context, AsyncSnapshot> snapshot) { - if (snapshot.hasError) { - return const Center( - child: TopCenteredMessage( - icon: Icons.report, - title: 'Error', - message: 'Player data couldn\'t\nbe loaded.', - ), - ); - } - if (snapshot.connectionState == ConnectionState.done && - (!snapshot.hasData || - snapshot.data!.isEmpty || - (selectedPlayers.isEmpty && - allPlayers.isEmpty))) { - return const Center( - child: TopCenteredMessage( - icon: Icons.info, - title: 'Info', - message: 'No players created yet.', - ), - ); - } - final bool isLoading = - snapshot.connectionState == ConnectionState.waiting; - return Expanded( - child: Skeletonizer( - effect: PulseEffect( - from: Colors.grey[800]!, - to: Colors.grey[600]!, - duration: const Duration(milliseconds: 800), - ), - enabled: isLoading, - enableSwitchAnimation: true, - switchAnimationConfig: const SwitchAnimationConfig( - duration: Duration(milliseconds: 200), - switchInCurve: Curves.linear, - switchOutCurve: Curves.linear, - transitionBuilder: - AnimatedSwitcher.defaultTransitionBuilder, - layoutBuilder: - AnimatedSwitcher.defaultLayoutBuilder, - ), - child: - (suggestedPlayers.isEmpty && - !allPlayers.isEmpty) - ? TopCenteredMessage( - icon: Icons.info, - title: 'Info', - message: - (selectedPlayers.length == - allPlayers.length) - ? 'No more players to add.' - : 'No players found with that name.', - ) - : ListView.builder( - itemCount: suggestedPlayers.length, - itemBuilder: (BuildContext context, int index) { - return Container( - margin: const EdgeInsets.symmetric( - horizontal: 5, - vertical: 5, - ), - padding: const EdgeInsets.symmetric( - horizontal: 10, - ), - decoration: BoxDecoration( - color: CustomTheme.boxColor, - border: Border.all( - color: CustomTheme.boxBorder, - ), - borderRadius: BorderRadius.circular( - 12, - ), - ), - child: Row( - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - mainAxisSize: MainAxisSize.max, - children: [ - Flexible( - child: Text( - suggestedPlayers[index].name, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - ), - ), - ), - IconButton( - icon: Icon(Icons.add, size: 20), - onPressed: () { - setState(() { - if (!selectedPlayers.contains( - suggestedPlayers[index], - )) { - selectedPlayers.add( + builder: + ( + BuildContext context, + AsyncSnapshot> snapshot, + ) { + if (snapshot.hasError) { + return const Center( + child: TopCenteredMessage( + icon: Icons.report, + title: 'Error', + message: 'Player data couldn\'t\nbe loaded.', + ), + ); + } + if (snapshot.connectionState == + ConnectionState.done && + (!snapshot.hasData || + snapshot.data!.isEmpty || + (selectedPlayers.isEmpty && + allPlayers.isEmpty))) { + return const Center( + child: TopCenteredMessage( + icon: Icons.info, + title: 'Info', + message: 'No players created yet.', + ), + ); + } + final bool isLoading = + snapshot.connectionState == + ConnectionState.waiting; + return Expanded( + child: Skeletonizer( + effect: PulseEffect( + from: Colors.grey[800]!, + to: Colors.grey[600]!, + duration: const Duration(milliseconds: 800), + ), + enabled: isLoading, + enableSwitchAnimation: true, + switchAnimationConfig: + const SwitchAnimationConfig( + duration: Duration(milliseconds: 200), + switchInCurve: Curves.linear, + switchOutCurve: Curves.linear, + transitionBuilder: AnimatedSwitcher + .defaultTransitionBuilder, + layoutBuilder: + AnimatedSwitcher.defaultLayoutBuilder, + ), + child: + (suggestedPlayers.isEmpty && + !allPlayers.isEmpty) + ? TopCenteredMessage( + icon: Icons.info, + title: 'Info', + message: + (selectedPlayers.length == + allPlayers.length) + ? 'No more players to add.' + : 'No players found with that name.', + ) + : ListView.builder( + itemCount: suggestedPlayers.length, + itemBuilder: + (BuildContext context, int index) { + return IconListTile( + text: suggestedPlayers[index] + .name, + icon: Icons.add, + onPressed: () { + setState(() { + if (!selectedPlayers.contains( suggestedPlayers[index], - ); - selectedPlayers.sort( - (a, b) => a.name - .compareTo(b.name), - ); - suggestedPlayers.remove( - suggestedPlayers[index], - ); - } - }); - }, - ), - ], - ), - ); - }, - ), - ), - ); - }, + )) { + selectedPlayers.add( + suggestedPlayers[index], + ); + selectedPlayers.sort( + (a, b) => a.name + .compareTo(b.name), + ); + suggestedPlayers.remove( + suggestedPlayers[index], + ); + } + }); + }, + ); + }, + ), + ), + ); + }, ), ], ), @@ -348,11 +273,12 @@ class _CreateGroupViewState extends State { (_groupNameController.text.isEmpty || selectedPlayers.isEmpty) ? null : () async { - String id = "ID_" + _groupNameController.text; - String name = _groupNameController.text; - List members = selectedPlayers; bool success = await db.groupDao.addGroup( - group: Group(id: id, name: name, members: members), + group: Group( + id: Uuid().v4(), + name: _groupNameController.text, + members: selectedPlayers, + ), ); if (success) { _groupNameController.clear(); From 2f260d7cbcfd01be9ec595f3427088e120970c58 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 20:14:18 +0100 Subject: [PATCH 18/89] Add uuid dependency --- pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pubspec.yaml b/pubspec.yaml index ab6e30b..fbbc01a 100644 --- a/pubspec.yaml +++ b/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: From 80290efa0b1d0046b0c18bea101dab4a82c05b83 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 20:37:41 +0100 Subject: [PATCH 19/89] rename FullWidthButton to CustomWidthButton --- .../views/main_menu/create_group/create_group_view.dart | 4 ++-- lib/presentation/views/main_menu/groups_view.dart | 4 ++-- .../{full_width_button.dart => custom_width_button.dart} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename lib/presentation/widgets/{full_width_button.dart => custom_width_button.dart} (93%) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart index 1a84956..8a89501 100644 --- a/lib/presentation/views/main_menu/create_group/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group/create_group_view.dart @@ -4,7 +4,7 @@ import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/player.dart'; import 'package:game_tracker/presentation/widgets/custom_search_bar.dart'; -import 'package:game_tracker/presentation/widgets/full_width_button.dart'; +import 'package:game_tracker/presentation/widgets/custom_width_button.dart'; import 'package:game_tracker/presentation/widgets/text_input_field.dart'; import 'package:game_tracker/presentation/widgets/tiles/text_icon_list_tile.dart'; import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart'; @@ -263,7 +263,7 @@ class _CreateGroupViewState extends State { ), ), ), - FullWidthButton( + CustomWidthButton( text: "Create group", infillColor: CustomTheme.primaryColor, borderColor: CustomTheme.primaryColor, diff --git a/lib/presentation/views/main_menu/groups_view.dart b/lib/presentation/views/main_menu/groups_view.dart index bdb3d4a..200f1d0 100644 --- a/lib/presentation/views/main_menu/groups_view.dart +++ b/lib/presentation/views/main_menu/groups_view.dart @@ -4,7 +4,7 @@ import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/player.dart'; import 'package:game_tracker/presentation/views/main_menu/create_group/create_group_view.dart'; -import 'package:game_tracker/presentation/widgets/full_width_button.dart'; +import 'package:game_tracker/presentation/widgets/custom_width_button.dart'; import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart'; import 'package:game_tracker/presentation/widgets/top_centered_message.dart'; import 'package:provider/provider.dart'; @@ -105,7 +105,7 @@ class _GroupsViewState extends State { Positioned( bottom: 80, - child: FullWidthButton( + child: CustomWidthButton( text: 'Create Group', infillColor: CustomTheme.primaryColor, borderColor: CustomTheme.primaryColor, diff --git a/lib/presentation/widgets/full_width_button.dart b/lib/presentation/widgets/custom_width_button.dart similarity index 93% rename from lib/presentation/widgets/full_width_button.dart rename to lib/presentation/widgets/custom_width_button.dart index fe9913c..b336a79 100644 --- a/lib/presentation/widgets/full_width_button.dart +++ b/lib/presentation/widgets/custom_width_button.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -class FullWidthButton extends StatelessWidget { - const FullWidthButton({ +class CustomWidthButton extends StatelessWidget { + const CustomWidthButton({ super.key, required this.text, required this.borderColor, From c67f688a7723c82c7026759472439f29bf65e98c Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 21:42:03 +0100 Subject: [PATCH 20/89] Refactor CreateGroupView: remove UUID generation, update tiles & fix async gaps --- .../create_group/create_group_view.dart | 59 +++++++++---------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group/create_group_view.dart index 8a89501..81d5e36 100644 --- a/lib/presentation/views/main_menu/create_group/create_group_view.dart +++ b/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 { late Future> _allPlayersFuture; late final List 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 { 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 { 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 { }); }, ), - 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: [ - 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 { ), ], ), - 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 { ), child: (suggestedPlayers.isEmpty && - !allPlayers.isEmpty) + allPlayers.isNotEmpty) ? TopCenteredMessage( icon: Icons.info, title: 'Info', @@ -230,10 +231,9 @@ class _CreateGroupViewState extends State { 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 { ), ), 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 { : () 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 { _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 { setState(() {}); }, ), - SizedBox(height: 20), + const SizedBox(height: 20), ], ), ), From 51a8c4ea58ab95ff732949868502acd66553537c Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 21:42:17 +0100 Subject: [PATCH 21/89] Replace `MaterialStateProperty` with `WidgetStateProperty` in `CustomSearchBar` --- lib/presentation/widgets/custom_search_bar.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/presentation/widgets/custom_search_bar.dart b/lib/presentation/widgets/custom_search_bar.dart index d0f66e8..b482efb 100644 --- a/lib/presentation/widgets/custom_search_bar.dart +++ b/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), ); } } From d65dd3d9838a9fa1075bcfd62460ec52ecb7f87e Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 21:42:40 +0100 Subject: [PATCH 22/89] Refactor CustomWidthButton to use ButtonStyle enum and CustomTheme - 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`. --- .../widgets/custom_width_button.dart | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/presentation/widgets/custom_width_button.dart b/lib/presentation/widgets/custom_width_button.dart index b336a79..b0b9bd3 100644 --- a/lib/presentation/widgets/custom_width_button.dart +++ b/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( From e0c83988730735e444bd87ad0e631be605dc5799 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 21:43:38 +0100 Subject: [PATCH 23/89] remove custom colors from Create Group button in GroupsView --- lib/presentation/views/main_menu/groups_view.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/presentation/views/main_menu/groups_view.dart b/lib/presentation/views/main_menu/groups_view.dart index 73f3509..7e6f59d 100644 --- a/lib/presentation/views/main_menu/groups_view.dart +++ b/lib/presentation/views/main_menu/groups_view.dart @@ -106,8 +106,6 @@ class _GroupsViewState extends State { bottom: 80, child: CustomWidthButton( text: 'Create Group', - infillColor: CustomTheme.primaryColor, - borderColor: CustomTheme.primaryColor, sizeRelativeToWidth: 0.90, onPressed: () async { await Navigator.push( From d3a63bd299e23cdfdf6470ff3793dce71076ad70 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 21:56:20 +0100 Subject: [PATCH 24/89] renamed IconListTile to TextIconListTile and replaced the icon parameter with iconEnabled in both TextIconListTile and TextIconTile --- .../widgets/tiles/text_icon_list_tile.dart | 28 +++++++++++++------ .../widgets/tiles/text_icon_tile.dart | 13 +++++---- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/lib/presentation/widgets/tiles/text_icon_list_tile.dart b/lib/presentation/widgets/tiles/text_icon_list_tile.dart index b32504f..92d0251 100644 --- a/lib/presentation/widgets/tiles/text_icon_list_tile.dart +++ b/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: Text( - text, - overflow: TextOverflow.ellipsis, - style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w500), + child: Container( + padding: const EdgeInsets.symmetric(vertical: 12.5), + child: Text( + text, + overflow: TextOverflow.ellipsis, + 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, + ), ], ), ); diff --git a/lib/presentation/widgets/tiles/text_icon_tile.dart b/lib/presentation/widgets/tiles/text_icon_tile.dart index 52174bd..2544837 100644 --- a/lib/presentation/widgets/tiles/text_icon_tile.dart +++ b/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) ...[ + if (iconEnabled) ...[ const SizedBox(width: 3), - GestureDetector(onTap: onIconTap, child: Icon(icon, size: 20)), + GestureDetector( + onTap: onIconTap, + child: const Icon(Icons.close, size: 20), + ), ], ], ), From d34163488531a2cc37ac0f5c1577dca3c8df0f7b Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 21:56:31 +0100 Subject: [PATCH 25/89] Disable icon for members in group tile --- lib/presentation/widgets/tiles/group_tile.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/presentation/widgets/tiles/group_tile.dart b/lib/presentation/widgets/tiles/group_tile.dart index d87cc12..fa91477 100644 --- a/lib/presentation/widgets/tiles/group_tile.dart +++ b/lib/presentation/widgets/tiles/group_tile.dart @@ -56,7 +56,8 @@ class GroupTile extends StatelessWidget { spacing: 12.0, runSpacing: 8.0, children: [ - 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), From 67c8a7e1811810a58e2344eade58703d096949a4 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 23:21:46 +0100 Subject: [PATCH 26/89] added createdAt timestamp to Group, Game, and Player DTOs --- lib/data/dto/game.dart | 5 ++++- lib/data/dto/group.dart | 10 ++++++++-- lib/data/dto/player.dart | 5 ++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/data/dto/game.dart b/lib/data/dto/game.dart index c84779d..b8ebf5c 100644 --- a/lib/data/dto/game.dart +++ b/lib/data/dto/game.dart @@ -8,14 +8,17 @@ class Game { final List? players; final Group? group; final String winner; + final DateTime createdAt; Game({ String? id, + DateTime? createdAt, required this.name, this.players, this.group, this.winner = '', - }) : id = id ?? const Uuid().v4(); + }) : id = id ?? const Uuid().v4(), + createdAt = createdAt ?? DateTime.now(); @override String toString() { diff --git a/lib/data/dto/group.dart b/lib/data/dto/group.dart index 0420477..6a27de1 100644 --- a/lib/data/dto/group.dart +++ b/lib/data/dto/group.dart @@ -5,9 +5,15 @@ class Group { final String id; final String name; final List members; + final DateTime createdAt; - Group({String? id, required this.name, required this.members}) - : id = id ?? const Uuid().v4(); + Group({ + String? id, + DateTime? createdAt, + required this.name, + required this.members, + }) : id = id ?? const Uuid().v4(), + createdAt = createdAt ?? DateTime.now(); @override String toString() { diff --git a/lib/data/dto/player.dart b/lib/data/dto/player.dart index 1b00c2c..5cbceef 100644 --- a/lib/data/dto/player.dart +++ b/lib/data/dto/player.dart @@ -3,8 +3,11 @@ import 'package:uuid/uuid.dart'; class Player { final String id; final String name; + final DateTime createdAt; - Player({String? id, required this.name}) : id = id ?? const Uuid().v4(); + Player({String? id, DateTime? createdAt, required this.name}) + : id = id ?? const Uuid().v4(), + createdAt = createdAt ?? DateTime.now(); @override String toString() { From 8cc898cad6b4b5e610dc9a38d0bdc1b15f631f9e Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 23:38:43 +0100 Subject: [PATCH 27/89] regenerated database.g.dart --- lib/data/db/database.g.dart | 298 +++++++++++++++++++++++++++++++----- 1 file changed, 263 insertions(+), 35 deletions(-) diff --git a/lib/data/db/database.g.dart b/lib/data/db/database.g.dart index 03b7a10..3f10169 100644 --- a/lib/data/db/database.g.dart +++ b/lib/data/db/database.g.dart @@ -27,8 +27,19 @@ class $PlayerTableTable extends PlayerTable type: DriftSqlType.string, requiredDuringInsert: true, ); + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', + ); @override - List get $columns => [id, name]; + late final GeneratedColumn createdAt = GeneratedColumn( + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); + @override + List get $columns => [id, name, createdAt]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -54,6 +65,14 @@ class $PlayerTableTable extends PlayerTable } else if (isInserting) { context.missing(_nameMeta); } + if (data.containsKey('created_at')) { + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); + } else if (isInserting) { + context.missing(_createdAtMeta); + } return context; } @@ -71,6 +90,10 @@ class $PlayerTableTable extends PlayerTable DriftSqlType.string, data['${effectivePrefix}name'], )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, ); } @@ -83,17 +106,27 @@ class $PlayerTableTable extends PlayerTable class PlayerTableData extends DataClass implements Insertable { final String id; final String name; - const PlayerTableData({required this.id, required this.name}); + final DateTime createdAt; + const PlayerTableData({ + required this.id, + required this.name, + required this.createdAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; map['id'] = Variable(id); map['name'] = Variable(name); + map['created_at'] = Variable(createdAt); return map; } PlayerTableCompanion toCompanion(bool nullToAbsent) { - return PlayerTableCompanion(id: Value(id), name: Value(name)); + return PlayerTableCompanion( + id: Value(id), + name: Value(name), + createdAt: Value(createdAt), + ); } factory PlayerTableData.fromJson( @@ -104,6 +137,7 @@ class PlayerTableData extends DataClass implements Insertable { return PlayerTableData( id: serializer.fromJson(json['id']), name: serializer.fromJson(json['name']), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -112,15 +146,21 @@ class PlayerTableData extends DataClass implements Insertable { return { 'id': serializer.toJson(id), 'name': serializer.toJson(name), + 'createdAt': serializer.toJson(createdAt), }; } - PlayerTableData copyWith({String? id, String? name}) => - PlayerTableData(id: id ?? this.id, name: name ?? this.name); + PlayerTableData copyWith({String? id, String? name, DateTime? createdAt}) => + PlayerTableData( + id: id ?? this.id, + name: name ?? this.name, + createdAt: createdAt ?? this.createdAt, + ); PlayerTableData copyWithCompanion(PlayerTableCompanion data) { return PlayerTableData( id: data.id.present ? data.id.value : this.id, name: data.name.present ? data.name.value : this.name, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, ); } @@ -128,44 +168,52 @@ class PlayerTableData extends DataClass implements Insertable { String toString() { return (StringBuffer('PlayerTableData(') ..write('id: $id, ') - ..write('name: $name') + ..write('name: $name, ') + ..write('createdAt: $createdAt') ..write(')')) .toString(); } @override - int get hashCode => Object.hash(id, name); + int get hashCode => Object.hash(id, name, createdAt); @override bool operator ==(Object other) => identical(this, other) || (other is PlayerTableData && other.id == this.id && - other.name == this.name); + other.name == this.name && + other.createdAt == this.createdAt); } class PlayerTableCompanion extends UpdateCompanion { final Value id; final Value name; + final Value createdAt; final Value rowid; const PlayerTableCompanion({ this.id = const Value.absent(), this.name = const Value.absent(), + this.createdAt = const Value.absent(), this.rowid = const Value.absent(), }); PlayerTableCompanion.insert({ required String id, required String name, + required DateTime createdAt, this.rowid = const Value.absent(), }) : id = Value(id), - name = Value(name); + name = Value(name), + createdAt = Value(createdAt); static Insertable custom({ Expression? id, Expression? name, + Expression? createdAt, Expression? rowid, }) { return RawValuesInsertable({ if (id != null) 'id': id, if (name != null) 'name': name, + if (createdAt != null) 'created_at': createdAt, if (rowid != null) 'rowid': rowid, }); } @@ -173,11 +221,13 @@ class PlayerTableCompanion extends UpdateCompanion { PlayerTableCompanion copyWith({ Value? id, Value? name, + Value? createdAt, Value? rowid, }) { return PlayerTableCompanion( id: id ?? this.id, name: name ?? this.name, + createdAt: createdAt ?? this.createdAt, rowid: rowid ?? this.rowid, ); } @@ -191,6 +241,9 @@ class PlayerTableCompanion extends UpdateCompanion { if (name.present) { map['name'] = Variable(name.value); } + if (createdAt.present) { + map['created_at'] = Variable(createdAt.value); + } if (rowid.present) { map['rowid'] = Variable(rowid.value); } @@ -202,6 +255,7 @@ class PlayerTableCompanion extends UpdateCompanion { return (StringBuffer('PlayerTableCompanion(') ..write('id: $id, ') ..write('name: $name, ') + ..write('createdAt: $createdAt, ') ..write('rowid: $rowid') ..write(')')) .toString(); @@ -232,8 +286,19 @@ class $GroupTableTable extends GroupTable type: DriftSqlType.string, requiredDuringInsert: true, ); + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', + ); @override - List get $columns => [id, name]; + late final GeneratedColumn createdAt = GeneratedColumn( + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); + @override + List get $columns => [id, name, createdAt]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -259,6 +324,14 @@ class $GroupTableTable extends GroupTable } else if (isInserting) { context.missing(_nameMeta); } + if (data.containsKey('created_at')) { + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); + } else if (isInserting) { + context.missing(_createdAtMeta); + } return context; } @@ -276,6 +349,10 @@ class $GroupTableTable extends GroupTable DriftSqlType.string, data['${effectivePrefix}name'], )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, ); } @@ -288,17 +365,27 @@ class $GroupTableTable extends GroupTable class GroupTableData extends DataClass implements Insertable { final String id; final String name; - const GroupTableData({required this.id, required this.name}); + final DateTime createdAt; + const GroupTableData({ + required this.id, + required this.name, + required this.createdAt, + }); @override Map toColumns(bool nullToAbsent) { final map = {}; map['id'] = Variable(id); map['name'] = Variable(name); + map['created_at'] = Variable(createdAt); return map; } GroupTableCompanion toCompanion(bool nullToAbsent) { - return GroupTableCompanion(id: Value(id), name: Value(name)); + return GroupTableCompanion( + id: Value(id), + name: Value(name), + createdAt: Value(createdAt), + ); } factory GroupTableData.fromJson( @@ -309,6 +396,7 @@ class GroupTableData extends DataClass implements Insertable { return GroupTableData( id: serializer.fromJson(json['id']), name: serializer.fromJson(json['name']), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -317,15 +405,21 @@ class GroupTableData extends DataClass implements Insertable { return { 'id': serializer.toJson(id), 'name': serializer.toJson(name), + 'createdAt': serializer.toJson(createdAt), }; } - GroupTableData copyWith({String? id, String? name}) => - GroupTableData(id: id ?? this.id, name: name ?? this.name); + GroupTableData copyWith({String? id, String? name, DateTime? createdAt}) => + GroupTableData( + id: id ?? this.id, + name: name ?? this.name, + createdAt: createdAt ?? this.createdAt, + ); GroupTableData copyWithCompanion(GroupTableCompanion data) { return GroupTableData( id: data.id.present ? data.id.value : this.id, name: data.name.present ? data.name.value : this.name, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, ); } @@ -333,44 +427,52 @@ class GroupTableData extends DataClass implements Insertable { String toString() { return (StringBuffer('GroupTableData(') ..write('id: $id, ') - ..write('name: $name') + ..write('name: $name, ') + ..write('createdAt: $createdAt') ..write(')')) .toString(); } @override - int get hashCode => Object.hash(id, name); + int get hashCode => Object.hash(id, name, createdAt); @override bool operator ==(Object other) => identical(this, other) || (other is GroupTableData && other.id == this.id && - other.name == this.name); + other.name == this.name && + other.createdAt == this.createdAt); } class GroupTableCompanion extends UpdateCompanion { final Value id; final Value name; + final Value createdAt; final Value rowid; const GroupTableCompanion({ this.id = const Value.absent(), this.name = const Value.absent(), + this.createdAt = const Value.absent(), this.rowid = const Value.absent(), }); GroupTableCompanion.insert({ required String id, required String name, + required DateTime createdAt, this.rowid = const Value.absent(), }) : id = Value(id), - name = Value(name); + name = Value(name), + createdAt = Value(createdAt); static Insertable custom({ Expression? id, Expression? name, + Expression? createdAt, Expression? rowid, }) { return RawValuesInsertable({ if (id != null) 'id': id, if (name != null) 'name': name, + if (createdAt != null) 'created_at': createdAt, if (rowid != null) 'rowid': rowid, }); } @@ -378,11 +480,13 @@ class GroupTableCompanion extends UpdateCompanion { GroupTableCompanion copyWith({ Value? id, Value? name, + Value? createdAt, Value? rowid, }) { return GroupTableCompanion( id: id ?? this.id, name: name ?? this.name, + createdAt: createdAt ?? this.createdAt, rowid: rowid ?? this.rowid, ); } @@ -396,6 +500,9 @@ class GroupTableCompanion extends UpdateCompanion { if (name.present) { map['name'] = Variable(name.value); } + if (createdAt.present) { + map['created_at'] = Variable(createdAt.value); + } if (rowid.present) { map['rowid'] = Variable(rowid.value); } @@ -407,6 +514,7 @@ class GroupTableCompanion extends UpdateCompanion { return (StringBuffer('GroupTableCompanion(') ..write('id: $id, ') ..write('name: $name, ') + ..write('createdAt: $createdAt, ') ..write('rowid: $rowid') ..write(')')) .toString(); @@ -451,8 +559,19 @@ class $GameTableTable extends GameTable 'REFERENCES player_table (id) ON DELETE CASCADE', ), ); + static const VerificationMeta _createdAtMeta = const VerificationMeta( + 'createdAt', + ); @override - List get $columns => [id, name, winnerId]; + late final GeneratedColumn createdAt = GeneratedColumn( + 'created_at', + aliasedName, + false, + type: DriftSqlType.dateTime, + requiredDuringInsert: true, + ); + @override + List get $columns => [id, name, winnerId, createdAt]; @override String get aliasedName => _alias ?? actualTableName; @override @@ -486,6 +605,14 @@ class $GameTableTable extends GameTable } else if (isInserting) { context.missing(_winnerIdMeta); } + if (data.containsKey('created_at')) { + context.handle( + _createdAtMeta, + createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta), + ); + } else if (isInserting) { + context.missing(_createdAtMeta); + } return context; } @@ -507,6 +634,10 @@ class $GameTableTable extends GameTable DriftSqlType.string, data['${effectivePrefix}winner_id'], )!, + createdAt: attachedDatabase.typeMapping.read( + DriftSqlType.dateTime, + data['${effectivePrefix}created_at'], + )!, ); } @@ -520,10 +651,12 @@ class GameTableData extends DataClass implements Insertable { final String id; final String name; final String winnerId; + final DateTime createdAt; const GameTableData({ required this.id, required this.name, required this.winnerId, + required this.createdAt, }); @override Map toColumns(bool nullToAbsent) { @@ -531,6 +664,7 @@ class GameTableData extends DataClass implements Insertable { map['id'] = Variable(id); map['name'] = Variable(name); map['winner_id'] = Variable(winnerId); + map['created_at'] = Variable(createdAt); return map; } @@ -539,6 +673,7 @@ class GameTableData extends DataClass implements Insertable { id: Value(id), name: Value(name), winnerId: Value(winnerId), + createdAt: Value(createdAt), ); } @@ -551,6 +686,7 @@ class GameTableData extends DataClass implements Insertable { id: serializer.fromJson(json['id']), name: serializer.fromJson(json['name']), winnerId: serializer.fromJson(json['winnerId']), + createdAt: serializer.fromJson(json['createdAt']), ); } @override @@ -560,20 +696,27 @@ class GameTableData extends DataClass implements Insertable { 'id': serializer.toJson(id), 'name': serializer.toJson(name), 'winnerId': serializer.toJson(winnerId), + 'createdAt': serializer.toJson(createdAt), }; } - GameTableData copyWith({String? id, String? name, String? winnerId}) => - GameTableData( - id: id ?? this.id, - name: name ?? this.name, - winnerId: winnerId ?? this.winnerId, - ); + GameTableData copyWith({ + String? id, + String? name, + String? winnerId, + DateTime? createdAt, + }) => GameTableData( + id: id ?? this.id, + name: name ?? this.name, + winnerId: winnerId ?? this.winnerId, + createdAt: createdAt ?? this.createdAt, + ); GameTableData copyWithCompanion(GameTableCompanion data) { return GameTableData( id: data.id.present ? data.id.value : this.id, name: data.name.present ? data.name.value : this.name, winnerId: data.winnerId.present ? data.winnerId.value : this.winnerId, + createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt, ); } @@ -582,51 +725,59 @@ class GameTableData extends DataClass implements Insertable { return (StringBuffer('GameTableData(') ..write('id: $id, ') ..write('name: $name, ') - ..write('winnerId: $winnerId') + ..write('winnerId: $winnerId, ') + ..write('createdAt: $createdAt') ..write(')')) .toString(); } @override - int get hashCode => Object.hash(id, name, winnerId); + int get hashCode => Object.hash(id, name, winnerId, createdAt); @override bool operator ==(Object other) => identical(this, other) || (other is GameTableData && other.id == this.id && other.name == this.name && - other.winnerId == this.winnerId); + other.winnerId == this.winnerId && + other.createdAt == this.createdAt); } class GameTableCompanion extends UpdateCompanion { final Value id; final Value name; final Value winnerId; + final Value createdAt; final Value rowid; const GameTableCompanion({ this.id = const Value.absent(), this.name = const Value.absent(), this.winnerId = const Value.absent(), + this.createdAt = const Value.absent(), this.rowid = const Value.absent(), }); GameTableCompanion.insert({ required String id, required String name, required String winnerId, + required DateTime createdAt, this.rowid = const Value.absent(), }) : id = Value(id), name = Value(name), - winnerId = Value(winnerId); + winnerId = Value(winnerId), + createdAt = Value(createdAt); static Insertable custom({ Expression? id, Expression? name, Expression? winnerId, + Expression? createdAt, Expression? rowid, }) { return RawValuesInsertable({ if (id != null) 'id': id, if (name != null) 'name': name, if (winnerId != null) 'winner_id': winnerId, + if (createdAt != null) 'created_at': createdAt, if (rowid != null) 'rowid': rowid, }); } @@ -635,12 +786,14 @@ class GameTableCompanion extends UpdateCompanion { Value? id, Value? name, Value? winnerId, + Value? createdAt, Value? rowid, }) { return GameTableCompanion( id: id ?? this.id, name: name ?? this.name, winnerId: winnerId ?? this.winnerId, + createdAt: createdAt ?? this.createdAt, rowid: rowid ?? this.rowid, ); } @@ -657,6 +810,9 @@ class GameTableCompanion extends UpdateCompanion { if (winnerId.present) { map['winner_id'] = Variable(winnerId.value); } + if (createdAt.present) { + map['created_at'] = Variable(createdAt.value); + } if (rowid.present) { map['rowid'] = Variable(rowid.value); } @@ -669,6 +825,7 @@ class GameTableCompanion extends UpdateCompanion { ..write('id: $id, ') ..write('name: $name, ') ..write('winnerId: $winnerId, ') + ..write('createdAt: $createdAt, ') ..write('rowid: $rowid') ..write(')')) .toString(); @@ -1437,12 +1594,14 @@ typedef $$PlayerTableTableCreateCompanionBuilder = PlayerTableCompanion Function({ required String id, required String name, + required DateTime createdAt, Value rowid, }); typedef $$PlayerTableTableUpdateCompanionBuilder = PlayerTableCompanion Function({ Value id, Value name, + Value createdAt, Value rowid, }); @@ -1534,6 +1693,11 @@ class $$PlayerTableTableFilterComposer builder: (column) => ColumnFilters(column), ); + ColumnFilters get createdAt => $composableBuilder( + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); + Expression gameTableRefs( Expression Function($$GameTableTableFilterComposer f) f, ) { @@ -1628,6 +1792,11 @@ class $$PlayerTableTableOrderingComposer column: $table.name, builder: (column) => ColumnOrderings(column), ); + + ColumnOrderings get createdAt => $composableBuilder( + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); } class $$PlayerTableTableAnnotationComposer @@ -1645,6 +1814,9 @@ class $$PlayerTableTableAnnotationComposer GeneratedColumn get name => $composableBuilder(column: $table.name, builder: (column) => column); + GeneratedColumn get createdAt => + $composableBuilder(column: $table.createdAt, builder: (column) => column); + Expression gameTableRefs( Expression Function($$GameTableTableAnnotationComposer a) f, ) { @@ -1755,15 +1927,26 @@ class $$PlayerTableTableTableManager ({ Value id = const Value.absent(), Value name = const Value.absent(), + Value createdAt = const Value.absent(), Value rowid = const Value.absent(), - }) => PlayerTableCompanion(id: id, name: name, rowid: rowid), + }) => PlayerTableCompanion( + id: id, + name: name, + createdAt: createdAt, + rowid: rowid, + ), createCompanionCallback: ({ required String id, required String name, + required DateTime createdAt, Value rowid = const Value.absent(), - }) => - PlayerTableCompanion.insert(id: id, name: name, rowid: rowid), + }) => PlayerTableCompanion.insert( + id: id, + name: name, + createdAt: createdAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map( (e) => ( @@ -1881,12 +2064,14 @@ typedef $$GroupTableTableCreateCompanionBuilder = GroupTableCompanion Function({ required String id, required String name, + required DateTime createdAt, Value rowid, }); typedef $$GroupTableTableUpdateCompanionBuilder = GroupTableCompanion Function({ Value id, Value name, + Value createdAt, Value rowid, }); @@ -1958,6 +2143,11 @@ class $$GroupTableTableFilterComposer builder: (column) => ColumnFilters(column), ); + ColumnFilters get createdAt => $composableBuilder( + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); + Expression playerGroupTableRefs( Expression Function($$PlayerGroupTableTableFilterComposer f) f, ) { @@ -2027,6 +2217,11 @@ class $$GroupTableTableOrderingComposer column: $table.name, builder: (column) => ColumnOrderings(column), ); + + ColumnOrderings get createdAt => $composableBuilder( + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); } class $$GroupTableTableAnnotationComposer @@ -2044,6 +2239,9 @@ class $$GroupTableTableAnnotationComposer GeneratedColumn get name => $composableBuilder(column: $table.name, builder: (column) => column); + GeneratedColumn get createdAt => + $composableBuilder(column: $table.createdAt, builder: (column) => column); + Expression playerGroupTableRefs( Expression Function($$PlayerGroupTableTableAnnotationComposer a) f, ) { @@ -2128,15 +2326,26 @@ class $$GroupTableTableTableManager ({ Value id = const Value.absent(), Value name = const Value.absent(), + Value createdAt = const Value.absent(), Value rowid = const Value.absent(), - }) => GroupTableCompanion(id: id, name: name, rowid: rowid), + }) => GroupTableCompanion( + id: id, + name: name, + createdAt: createdAt, + rowid: rowid, + ), createCompanionCallback: ({ required String id, required String name, + required DateTime createdAt, Value rowid = const Value.absent(), - }) => - GroupTableCompanion.insert(id: id, name: name, rowid: rowid), + }) => GroupTableCompanion.insert( + id: id, + name: name, + createdAt: createdAt, + rowid: rowid, + ), withReferenceMapper: (p0) => p0 .map( (e) => ( @@ -2228,6 +2437,7 @@ typedef $$GameTableTableCreateCompanionBuilder = required String id, required String name, required String winnerId, + required DateTime createdAt, Value rowid, }); typedef $$GameTableTableUpdateCompanionBuilder = @@ -2235,6 +2445,7 @@ typedef $$GameTableTableUpdateCompanionBuilder = Value id, Value name, Value winnerId, + Value createdAt, Value rowid, }); @@ -2319,6 +2530,11 @@ class $$GameTableTableFilterComposer builder: (column) => ColumnFilters(column), ); + ColumnFilters get createdAt => $composableBuilder( + column: $table.createdAt, + builder: (column) => ColumnFilters(column), + ); + $$PlayerTableTableFilterComposer get winnerId { final $$PlayerTableTableFilterComposer composer = $composerBuilder( composer: this, @@ -2412,6 +2628,11 @@ class $$GameTableTableOrderingComposer builder: (column) => ColumnOrderings(column), ); + ColumnOrderings get createdAt => $composableBuilder( + column: $table.createdAt, + builder: (column) => ColumnOrderings(column), + ); + $$PlayerTableTableOrderingComposer get winnerId { final $$PlayerTableTableOrderingComposer composer = $composerBuilder( composer: this, @@ -2451,6 +2672,9 @@ class $$GameTableTableAnnotationComposer GeneratedColumn get name => $composableBuilder(column: $table.name, builder: (column) => column); + GeneratedColumn get createdAt => + $composableBuilder(column: $table.createdAt, builder: (column) => column); + $$PlayerTableTableAnnotationComposer get winnerId { final $$PlayerTableTableAnnotationComposer composer = $composerBuilder( composer: this, @@ -2560,11 +2784,13 @@ class $$GameTableTableTableManager Value id = const Value.absent(), Value name = const Value.absent(), Value winnerId = const Value.absent(), + Value createdAt = const Value.absent(), Value rowid = const Value.absent(), }) => GameTableCompanion( id: id, name: name, winnerId: winnerId, + createdAt: createdAt, rowid: rowid, ), createCompanionCallback: @@ -2572,11 +2798,13 @@ class $$GameTableTableTableManager required String id, required String name, required String winnerId, + required DateTime createdAt, Value rowid = const Value.absent(), }) => GameTableCompanion.insert( id: id, name: name, winnerId: winnerId, + createdAt: createdAt, rowid: rowid, ), withReferenceMapper: (p0) => p0 From 2ee8edcf9b94a9cca5a57534656b76ecfbaca4d0 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 18 Nov 2025 23:47:45 +0100 Subject: [PATCH 28/89] add createdAt column to game, group and player tables and DAOs --- lib/data/dao/game_dao.dart | 8 +++++++- lib/data/dao/group_dao.dart | 24 +++++++++++++++++++----- lib/data/dao/player_dao.dart | 22 +++++++++++++++++----- lib/data/db/tables/game_table.dart | 1 + lib/data/db/tables/group_table.dart | 1 + lib/data/db/tables/player_table.dart | 1 + 6 files changed, 46 insertions(+), 11 deletions(-) diff --git a/lib/data/dao/game_dao.dart b/lib/data/dao/game_dao.dart index fc931ad..94d010c 100644 --- a/lib/data/dao/game_dao.dart +++ b/lib/data/dao/game_dao.dart @@ -15,7 +15,11 @@ class GameDao extends DatabaseAccessor with _$GameDaoMixin { Future> getAllGames() async { final query = select(gameTable); final result = await query.get(); - return result.map((row) => Game(id: row.id, name: row.name)).toList(); + return result + .map( + (row) => Game(id: row.id, name: row.name, createdAt: row.createdAt), + ) + .toList(); } /// Retrieves a [Game] by its [gameId]. @@ -38,6 +42,7 @@ class GameDao extends DatabaseAccessor with _$GameDaoMixin { players: players, group: group, winner: result.winnerId, + createdAt: result.createdAt, ); } @@ -58,6 +63,7 @@ class GameDao extends DatabaseAccessor with _$GameDaoMixin { id: game.id, name: game.name, winnerId: game.winner, + createdAt: game.createdAt, ), mode: InsertMode.insertOrReplace, ); diff --git a/lib/data/dao/group_dao.dart b/lib/data/dao/group_dao.dart index 8eb3a1a..1b0b09a 100644 --- a/lib/data/dao/group_dao.dart +++ b/lib/data/dao/group_dao.dart @@ -19,7 +19,12 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { final members = await db.playerGroupDao.getPlayersOfGroupById( groupId: groupData.id, ); - return Group(id: groupData.id, name: groupData.name, members: members); + return Group( + id: groupData.id, + name: groupData.name, + members: members, + createdAt: groupData.createdAt, + ); }), ); } @@ -33,7 +38,12 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { groupId: groupId, ); - return Group(id: result.id, name: result.name, members: members); + return Group( + id: result.id, + name: result.name, + members: members, + createdAt: result.createdAt, + ); } /// Adds a new group with the given [id] and [name] to the database. @@ -41,9 +51,13 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { Future addGroup({required Group group}) async { if (!await groupExists(groupId: group.id)) { await db.transaction(() async { - await into( - groupTable, - ).insert(GroupTableCompanion.insert(id: group.id, name: group.name)); + await into(groupTable).insert( + GroupTableCompanion.insert( + id: group.id, + name: group.name, + createdAt: group.createdAt, + ), + ); await db.batch( (b) => b.insertAll( db.playerGroupTable, diff --git a/lib/data/dao/player_dao.dart b/lib/data/dao/player_dao.dart index 591634c..36f9305 100644 --- a/lib/data/dao/player_dao.dart +++ b/lib/data/dao/player_dao.dart @@ -13,14 +13,22 @@ class PlayerDao extends DatabaseAccessor with _$PlayerDaoMixin { Future> getAllPlayers() async { final query = select(playerTable); final result = await query.get(); - return result.map((row) => Player(id: row.id, name: row.name)).toList(); + return result + .map( + (row) => Player(id: row.id, name: row.name, createdAt: row.createdAt), + ) + .toList(); } /// Retrieves a [Player] by their [id]. Future getPlayerById({required String playerId}) async { final query = select(playerTable)..where((p) => p.id.equals(playerId)); final result = await query.getSingle(); - return Player(id: result.id, name: result.name); + return Player( + id: result.id, + name: result.name, + createdAt: result.createdAt, + ); } /// Adds a new [player] to the database. @@ -28,9 +36,13 @@ class PlayerDao extends DatabaseAccessor with _$PlayerDaoMixin { /// the new one. Future addPlayer({required Player player}) async { if (!await playerExists(playerId: player.id)) { - await into( - playerTable, - ).insert(PlayerTableCompanion.insert(id: player.id, name: player.name)); + await into(playerTable).insert( + PlayerTableCompanion.insert( + id: player.id, + name: player.name, + createdAt: player.createdAt, + ), + ); return true; } return false; diff --git a/lib/data/db/tables/game_table.dart b/lib/data/db/tables/game_table.dart index 9651a79..0fe5a3c 100644 --- a/lib/data/db/tables/game_table.dart +++ b/lib/data/db/tables/game_table.dart @@ -6,6 +6,7 @@ class GameTable extends Table { TextColumn get name => text()(); TextColumn get winnerId => text().references(PlayerTable, #id, onDelete: KeyAction.cascade)(); + DateTimeColumn get createdAt => dateTime()(); @override Set> get primaryKey => {id}; diff --git a/lib/data/db/tables/group_table.dart b/lib/data/db/tables/group_table.dart index dc9335d..5c52355 100644 --- a/lib/data/db/tables/group_table.dart +++ b/lib/data/db/tables/group_table.dart @@ -3,6 +3,7 @@ import 'package:drift/drift.dart'; class GroupTable extends Table { TextColumn get id => text()(); TextColumn get name => text()(); + DateTimeColumn get createdAt => dateTime()(); @override Set> get primaryKey => {id}; diff --git a/lib/data/db/tables/player_table.dart b/lib/data/db/tables/player_table.dart index 3d97459..794958e 100644 --- a/lib/data/db/tables/player_table.dart +++ b/lib/data/db/tables/player_table.dart @@ -3,6 +3,7 @@ import 'package:drift/drift.dart'; class PlayerTable extends Table { TextColumn get id => text()(); TextColumn get name => text()(); + DateTimeColumn get createdAt => dateTime()(); @override Set> get primaryKey => {id}; From 19c99eef9c5a2f581ab71d5d6bca8ee4120bd62c Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 19 Nov 2025 00:27:08 +0100 Subject: [PATCH 29/89] use clock.now() instead of DateTime.now() for DTO creation timestamps --- lib/data/dto/game.dart | 3 ++- lib/data/dto/group.dart | 3 ++- lib/data/dto/player.dart | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/data/dto/game.dart b/lib/data/dto/game.dart index b8ebf5c..96e9d73 100644 --- a/lib/data/dto/game.dart +++ b/lib/data/dto/game.dart @@ -1,3 +1,4 @@ +import 'package:clock/clock.dart'; import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/player.dart'; import 'package:uuid/uuid.dart'; @@ -18,7 +19,7 @@ class Game { this.group, this.winner = '', }) : id = id ?? const Uuid().v4(), - createdAt = createdAt ?? DateTime.now(); + createdAt = createdAt ?? clock.now(); @override String toString() { diff --git a/lib/data/dto/group.dart b/lib/data/dto/group.dart index 6a27de1..46c6f91 100644 --- a/lib/data/dto/group.dart +++ b/lib/data/dto/group.dart @@ -1,3 +1,4 @@ +import 'package:clock/clock.dart'; import 'package:game_tracker/data/dto/player.dart'; import 'package:uuid/uuid.dart'; @@ -13,7 +14,7 @@ class Group { required this.name, required this.members, }) : id = id ?? const Uuid().v4(), - createdAt = createdAt ?? DateTime.now(); + createdAt = createdAt ?? clock.now(); @override String toString() { diff --git a/lib/data/dto/player.dart b/lib/data/dto/player.dart index 5cbceef..4ef58b1 100644 --- a/lib/data/dto/player.dart +++ b/lib/data/dto/player.dart @@ -1,3 +1,4 @@ +import 'package:clock/clock.dart'; import 'package:uuid/uuid.dart'; class Player { @@ -7,7 +8,7 @@ class Player { Player({String? id, DateTime? createdAt, required this.name}) : id = id ?? const Uuid().v4(), - createdAt = createdAt ?? DateTime.now(); + createdAt = createdAt ?? clock.now(); @override String toString() { From 75c6f4e01c601cb8a084a25b33d7e3876cd29e88 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 19 Nov 2025 00:27:40 +0100 Subject: [PATCH 30/89] verify createdAt timestamps in database tests using mocked clock --- test/db_tests/game_test.dart | 79 ++++++++++++-------- test/db_tests/group_test.dart | 133 +++++++++++++++++++-------------- test/db_tests/player_test.dart | 52 ++++++++----- 3 files changed, 156 insertions(+), 108 deletions(-) diff --git a/test/db_tests/game_test.dart b/test/db_tests/game_test.dart index 4f4b23f..0c86e45 100644 --- a/test/db_tests/game_test.dart +++ b/test/db_tests/game_test.dart @@ -1,3 +1,4 @@ +import 'package:clock/clock.dart'; import 'package:drift/drift.dart'; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -15,6 +16,8 @@ void main() { late Player player5; late Group testgroup; late Game testgame; + final fixedDate = DateTime(2025, 19, 11, 00, 11, 23); + final fakeClock = Clock(() => fixedDate); setUp(() { database = AppDatabase( @@ -25,17 +28,22 @@ void main() { ), ); - 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( - name: 'Test Game', - group: testgroup, - players: [player4, player5], - ); + withClock(fakeClock, () { + 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( + name: 'Test Game', + group: testgroup, + players: [player4, player5], + ); + }); }); tearDown(() async { await database.close(); @@ -43,34 +51,41 @@ void main() { group('game tests', () { test('game is added correctly', () async { - await database.gameDao.addGame(game: testgame); + await withClock(fakeClock, () async { + await database.gameDao.addGame(game: testgame); - final result = await database.gameDao.getGameById(gameId: testgame.id); + final result = await database.gameDao.getGameById(gameId: testgame.id); - expect(result.id, testgame.id); - expect(result.name, testgame.name); - expect(result.winner, testgame.winner); + expect(result.id, testgame.id); + expect(result.name, testgame.name); + expect(result.winner, testgame.winner); + expect(result.createdAt, testgame.createdAt); - if (result.group != null) { - expect(result.group!.members.length, testgroup.members.length); + if (result.group != null) { + expect(result.group!.members.length, testgroup.members.length); - for (int i = 0; i < testgroup.members.length; i++) { - expect(result.group!.members[i].id, testgroup.members[i].id); - expect(result.group!.members[i].name, testgroup.members[i].name); + for (int i = 0; i < testgroup.members.length; i++) { + expect(result.group!.members[i].id, testgroup.members[i].id); + expect(result.group!.members[i].name, testgroup.members[i].name); + } + } else { + fail('Group is null'); } - } else { - fail('Group is null'); - } - if (result.players != null) { - expect(result.players!.length, testgame.players!.length); + if (result.players != null) { + expect(result.players!.length, testgame.players!.length); - for (int i = 0; i < testgame.players!.length; i++) { - expect(result.players![i].id, testgame.players![i].id); - expect(result.players![i].name, testgame.players![i].name); + for (int i = 0; i < testgame.players!.length; i++) { + expect(result.players![i].id, testgame.players![i].id); + expect(result.players![i].name, testgame.players![i].name); + expect( + result.players![i].createdAt, + testgame.players![i].createdAt, + ); + } + } else { + fail('Players is null'); } - } else { - fail('Players is null'); - } + }); }); test('game is deleted correctly', () async { diff --git a/test/db_tests/group_test.dart b/test/db_tests/group_test.dart index 3a9d8ca..5730617 100644 --- a/test/db_tests/group_test.dart +++ b/test/db_tests/group_test.dart @@ -1,3 +1,4 @@ +import 'package:clock/clock.dart'; import 'package:drift/drift.dart'; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -12,6 +13,8 @@ void main() { late Player player3; late Player player4; late Group testgroup; + final fixedDate = DateTime(2025, 19, 11, 00, 11, 23); + final fakeClock = Clock(() => fixedDate); setUp(() { database = AppDatabase( @@ -22,54 +25,69 @@ void main() { ), ); - 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]); + withClock(fakeClock, () { + 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(); }); group('group tests', () { test('all groups get fetched correctly', () async { - final testgroup2 = Group( - id: 'gr2', - name: 'Second Group', - members: [player2, player3, player4], - ); - await database.groupDao.addGroup(group: testgroup); - await database.groupDao.addGroup(group: testgroup2); + await withClock(fakeClock, () async { + final testgroup2 = Group( + id: 'gr2', + name: 'Second Group', + members: [player2, player3, player4], + ); + await database.groupDao.addGroup(group: testgroup); + await database.groupDao.addGroup(group: testgroup2); - final allGroups = await database.groupDao.getAllGroups(); - expect(allGroups.length, 2); + final allGroups = await database.groupDao.getAllGroups(); + expect(allGroups.length, 2); - final fetchedGroup1 = allGroups.firstWhere((g) => g.id == testgroup.id); - expect(fetchedGroup1.name, testgroup.name); - expect(fetchedGroup1.members.length, testgroup.members.length); - expect(fetchedGroup1.members.elementAt(0).id, player1.id); + final fetchedGroup1 = allGroups.firstWhere((g) => g.id == testgroup.id); + expect(fetchedGroup1.name, testgroup.name); + expect(fetchedGroup1.members.length, testgroup.members.length); + expect(fetchedGroup1.members.elementAt(0).id, player1.id); + expect(fetchedGroup1.members.elementAt(0).createdAt, player1.createdAt); - final fetchedGroup2 = allGroups.firstWhere((g) => g.id == testgroup2.id); - expect(fetchedGroup2.name, testgroup2.name); - expect(fetchedGroup2.members.length, testgroup2.members.length); - expect(fetchedGroup2.members.elementAt(0).id, player2.id); + final fetchedGroup2 = allGroups.firstWhere( + (g) => g.id == testgroup2.id, + ); + expect(fetchedGroup2.name, testgroup2.name); + expect(fetchedGroup2.members.length, testgroup2.members.length); + expect(fetchedGroup2.members.elementAt(0).id, player2.id); + expect(fetchedGroup2.members.elementAt(0).createdAt, player2.createdAt); + }); }); test('group and group members gets added correctly', () async { - await database.groupDao.addGroup(group: testgroup); + await withClock(fakeClock, () async { + await database.groupDao.addGroup(group: testgroup); - final result = await database.groupDao.getGroupById( - groupId: testgroup.id, - ); + final result = await database.groupDao.getGroupById( + groupId: testgroup.id, + ); - expect(result.id, testgroup.id); - expect(result.name, testgroup.name); + expect(result.id, testgroup.id); + expect(result.name, testgroup.name); + expect(result.createdAt, testgroup.createdAt); - expect(result.members.length, testgroup.members.length); - for (int i = 0; i < testgroup.members.length; i++) { - expect(result.members[i].id, testgroup.members[i].id); - expect(result.members[i].name, testgroup.members[i].name); - } + expect(result.members.length, testgroup.members.length); + for (int i = 0; i < testgroup.members.length; i++) { + expect(result.members[i].id, testgroup.members[i].id); + expect(result.members[i].name, testgroup.members[i].name); + expect(result.members[i].createdAt, testgroup.members[i].createdAt); + } + }); }); test('group gets deleted correctly', () async { @@ -103,36 +121,39 @@ void main() { }); test('Adding player to group works correctly', () async { - await database.groupDao.addGroup(group: testgroup); + await withClock(fakeClock, () async { + await database.groupDao.addGroup(group: testgroup); - await database.playerGroupDao.addPlayerToGroup( - player: player4, - groupId: testgroup.id, - ); + await database.playerGroupDao.addPlayerToGroup( + player: player4, + groupId: testgroup.id, + ); - final playerAdded = await database.playerGroupDao.isPlayerInGroup( - playerId: player4.id, - groupId: testgroup.id, - ); + final playerAdded = await database.playerGroupDao.isPlayerInGroup( + playerId: player4.id, + groupId: testgroup.id, + ); - expect(playerAdded, true); + expect(playerAdded, true); - final playerNotAdded = !await database.playerGroupDao.isPlayerInGroup( - playerId: '', - groupId: testgroup.id, - ); + final playerNotAdded = !await database.playerGroupDao.isPlayerInGroup( + playerId: '', + groupId: testgroup.id, + ); - expect(playerNotAdded, true); + expect(playerNotAdded, true); - expect(playerAdded, true); + final result = await database.groupDao.getGroupById( + groupId: testgroup.id, + ); + expect(result.members.length, testgroup.members.length + 1); - final result = await database.groupDao.getGroupById( - groupId: testgroup.id, - ); - expect(result.members.length, testgroup.members.length + 1); - - final addedPlayer = result.members.firstWhere((p) => p.id == player4.id); - expect(addedPlayer.name, player4.name); + final addedPlayer = result.members.firstWhere( + (p) => p.id == player4.id, + ); + expect(addedPlayer.name, player4.name); + expect(addedPlayer.createdAt, player4.createdAt); + }); }); test('Removing player from group works correctly', () async { diff --git a/test/db_tests/player_test.dart b/test/db_tests/player_test.dart index 91f4acb..ce75297 100644 --- a/test/db_tests/player_test.dart +++ b/test/db_tests/player_test.dart @@ -1,3 +1,4 @@ +import 'package:clock/clock.dart'; import 'package:drift/drift.dart'; import 'package:drift/native.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -7,6 +8,8 @@ import 'package:game_tracker/data/dto/player.dart'; void main() { late AppDatabase database; late Player testPlayer; + final fixedDate = DateTime(2025, 19, 11, 00, 11, 23); + final fakeClock = Clock(() => fixedDate); setUp(() { database = AppDatabase( @@ -17,7 +20,9 @@ void main() { ), ); - testPlayer = Player(name: 'Test Player'); + withClock(fakeClock, () { + testPlayer = Player(name: 'Test Player'); + }); }); tearDown(() async { await database.close(); @@ -25,32 +30,39 @@ void main() { group('player tests', () { test('all players get fetched correctly', () async { - final testPlayer2 = Player(name: 'Second Group'); - await database.playerDao.addPlayer(player: testPlayer); - await database.playerDao.addPlayer(player: testPlayer2); + await withClock(fakeClock, () async { + final testPlayer2 = Player(name: 'Second Group'); + await database.playerDao.addPlayer(player: testPlayer); + await database.playerDao.addPlayer(player: testPlayer2); - final allPlayers = await database.playerDao.getAllPlayers(); - expect(allPlayers.length, 2); + final allPlayers = await database.playerDao.getAllPlayers(); + expect(allPlayers.length, 2); - final fetchedPlayer1 = allPlayers.firstWhere( - (g) => g.id == testPlayer.id, - ); - expect(fetchedPlayer1.name, testPlayer.name); + final fetchedPlayer1 = allPlayers.firstWhere( + (g) => g.id == testPlayer.id, + ); + expect(fetchedPlayer1.name, testPlayer.name); + expect(fetchedPlayer1.createdAt, testPlayer.createdAt); - final fetchedPlayer2 = allPlayers.firstWhere( - (g) => g.id == testPlayer2.id, - ); - expect(fetchedPlayer2.name, testPlayer2.name); + final fetchedPlayer2 = allPlayers.firstWhere( + (g) => g.id == testPlayer2.id, + ); + expect(fetchedPlayer2.name, testPlayer2.name); + expect(fetchedPlayer2.createdAt, testPlayer2.createdAt); + }); }); test('players get inserted correcly ', () async { - await database.playerDao.addPlayer(player: testPlayer); - final result = await database.playerDao.getPlayerById( - playerId: testPlayer.id, - ); + await withClock(fakeClock, () async { + await database.playerDao.addPlayer(player: testPlayer); + final result = await database.playerDao.getPlayerById( + playerId: testPlayer.id, + ); - expect(result.id, testPlayer.id); - expect(result.name, testPlayer.name); + expect(result.id, testPlayer.id); + expect(result.name, testPlayer.name); + expect(result.createdAt, testPlayer.createdAt); + }); }); test('players get deleted correcly ', () async { From 8150b42dbad6a3ce79c46a53d3431b345a2ce3c9 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 19 Nov 2025 00:27:47 +0100 Subject: [PATCH 31/89] add `clock` dependency to pubspec.yaml --- pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pubspec.yaml b/pubspec.yaml index fbbc01a..b17f409 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,6 +20,7 @@ dependencies: provider: ^6.1.5 skeletonizer: ^2.1.0+1 uuid: ^4.5.2 + clock: ^1.1.2 dev_dependencies: flutter_test: From a8962e68b66bc42793b705557db1e3474ecab765 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 09:51:37 +0100 Subject: [PATCH 32/89] Added first workflow --- .gitea/workflows/pull_request.yaml | 39 ++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .gitea/workflows/pull_request.yaml diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml new file mode 100644 index 0000000..8daedbc --- /dev/null +++ b/.gitea/workflows/pull_request.yaml @@ -0,0 +1,39 @@ +name: Pull Request Pipeline + +on: + pull_request: + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set Up Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: 'stable' + channel: 'stable' + + - name: Check Formatting + run: flutter analyze + + test: + runs-on: ubuntu-latest + needs: lint + + steps: + - uses: actions/checkout@v4 + + - name: Set Up Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: 'stable' + channel: 'stable' + + - name: Get dependencies + run: flutter pub get + + - name: Run Tests + run: flutter test \ No newline at end of file From eeec92181a1f6e63350b77c4f1c936d202d4a4c8 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 09:53:54 +0100 Subject: [PATCH 33/89] Added jq installation --- .gitea/workflows/pull_request.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 8daedbc..9985eb8 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -10,6 +10,9 @@ jobs: - name: Checkout code uses: actions/checkout@v4 + - name: Install jq + run: sudo apt-get install -y jq + - name: Set Up Flutter uses: subosito/flutter-action@v2 with: From ddc8d93592f715779499b7122c86e41324563022 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 09:56:05 +0100 Subject: [PATCH 34/89] Removed sudo --- .gitea/workflows/pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 9985eb8..1593c18 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v4 - name: Install jq - run: sudo apt-get install -y jq + run: apt-get install -y jq - name: Set Up Flutter uses: subosito/flutter-action@v2 From 8d91eb37808a41ea865716ab6f10e1a2d104b3c5 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 09:58:03 +0100 Subject: [PATCH 35/89] Added update --- .gitea/workflows/pull_request.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 1593c18..25b7c7e 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -11,7 +11,9 @@ jobs: uses: actions/checkout@v4 - name: Install jq - run: apt-get install -y jq + run: | + apt-get update + apt-get install -y jq - name: Set Up Flutter uses: subosito/flutter-action@v2 From 003835472d107cd578dd4ff486a3767f038f0264 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:00:09 +0100 Subject: [PATCH 36/89] Added flutter version again --- .gitea/workflows/pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 25b7c7e..22869cf 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -18,7 +18,7 @@ jobs: - name: Set Up Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 'stable' + flutter-version: '3.38.2' channel: 'stable' - name: Check Formatting From 6ae39717fdfe4214bfe6383c22433dc46fbdc12c Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:02:39 +0100 Subject: [PATCH 37/89] Cleaned flutter cache --- .gitea/workflows/pull_request.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 22869cf..4ac911b 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -14,6 +14,12 @@ jobs: run: | apt-get update apt-get install -y jq + + + - name: Clean Flutter Cache + run: | + rm -rf /opt/hostedtoolcache/flutter + rm -rf ~/flutter - name: Set Up Flutter uses: subosito/flutter-action@v2 From 63d2117a6a40836642801180029aafd4571929b5 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:05:55 +0100 Subject: [PATCH 38/89] Tried sth --- .gitea/workflows/pull_request.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 4ac911b..2550dcf 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -21,15 +21,12 @@ jobs: rm -rf /opt/hostedtoolcache/flutter rm -rf ~/flutter - - name: Set Up Flutter - uses: subosito/flutter-action@v2 - with: - flutter-version: '3.38.2' - channel: 'stable' - - name: Check Formatting run: flutter analyze + + + test: runs-on: ubuntu-latest needs: lint From 974f06b6b886ef23846ac890906c77264e6c7566 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:06:46 +0100 Subject: [PATCH 39/89] Back again --- .gitea/workflows/pull_request.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 2550dcf..8f8f0d1 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -21,12 +21,17 @@ jobs: rm -rf /opt/hostedtoolcache/flutter rm -rf ~/flutter + - name: Set Up Flutter + uses: subosito/flutter-action@v2 + with: + flutter-version: '3.38.2' + channel: 'stable' + - name: Check Formatting run: flutter analyze - test: runs-on: ubuntu-latest needs: lint From 6638c2deee81a4f67402e0b3de48fbc6467677f0 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:08:04 +0100 Subject: [PATCH 40/89] Removed cache clearing --- .gitea/workflows/pull_request.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 8f8f0d1..b2027d6 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -14,12 +14,6 @@ jobs: run: | apt-get update apt-get install -y jq - - - - name: Clean Flutter Cache - run: | - rm -rf /opt/hostedtoolcache/flutter - rm -rf ~/flutter - name: Set Up Flutter uses: subosito/flutter-action@v2 From 10e56a7241928f2873e52d271b99d006fbe0362f Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:09:15 +0100 Subject: [PATCH 41/89] Downgraded flutter version --- .gitea/workflows/pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index b2027d6..d209dd2 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -18,8 +18,8 @@ jobs: - name: Set Up Flutter uses: subosito/flutter-action@v2 with: - flutter-version: '3.38.2' channel: 'stable' + flutter-version: '3.22.0' - name: Check Formatting run: flutter analyze From 7cc72015d3705a7e75821fec31bf7c84d5049ae6 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:11:22 +0100 Subject: [PATCH 42/89] Upgraded to flutter 3.35.6 --- .gitea/workflows/pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index d209dd2..867f174 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -19,7 +19,7 @@ jobs: uses: subosito/flutter-action@v2 with: channel: 'stable' - flutter-version: '3.22.0' + flutter-version: '3.35.6' - name: Check Formatting run: flutter analyze From 7123d36cd811a6cabc45e36622c382faa7df6d63 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:15:12 +0100 Subject: [PATCH 43/89] Updated flutter installation way --- .gitea/workflows/pull_request.yaml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 867f174..0b71231 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -15,11 +15,18 @@ jobs: apt-get update apt-get install -y jq - - name: Set Up Flutter - uses: subosito/flutter-action@v2 - with: - channel: 'stable' - flutter-version: '3.35.6' + - name: Install Flutter + run: | + # Flutter SDK herunterladen und entpacken + wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.35.6-stable.tar.xz + tar xf flutter_linux_3.35.6-stable.tar.xz + # Flutter zum PATH hinzufügen + echo "$(pwd)/flutter/bin" >> $GITHUB_PATH + # Flutter Doctor ausführen (optional) + flutter doctor -v + + - name: Get dependencies + run: flutter pub get - name: Check Formatting run: flutter analyze @@ -31,13 +38,19 @@ jobs: needs: lint steps: - - uses: actions/checkout@v4 + - name: Checkout code + uses: actions/checkout@v4 + + - name: Install jq + run: | + apt-get update + apt-get install -y jq - name: Set Up Flutter uses: subosito/flutter-action@v2 with: - flutter-version: 'stable' channel: 'stable' + flutter-version: '3.35.0' - name: Get dependencies run: flutter pub get From 17c14dd2302c32230667b30de1abd668a22c7c98 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:19:45 +0100 Subject: [PATCH 44/89] Added container --- .gitea/workflows/pull_request.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 0b71231..a28864a 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -6,6 +6,7 @@ on: jobs: lint: runs-on: ubuntu-latest + container: node:18-bullseye steps: - name: Checkout code uses: actions/checkout@v4 @@ -21,7 +22,7 @@ jobs: wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.35.6-stable.tar.xz tar xf flutter_linux_3.35.6-stable.tar.xz # Flutter zum PATH hinzufügen - echo "$(pwd)/flutter/bin" >> $GITHUB_PATH + echo "$(pwd)/flutter/bin" >> /usr/local/bin # Flutter Doctor ausführen (optional) flutter doctor -v From e108bb41f6b8ffa464bce490c6ac440dcf76d4ba Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:22:55 +0100 Subject: [PATCH 45/89] Corrected installation --- .gitea/workflows/pull_request.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index a28864a..62aa58e 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -18,13 +18,12 @@ jobs: - name: Install Flutter run: | - # Flutter SDK herunterladen und entpacken wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.35.6-stable.tar.xz tar xf flutter_linux_3.35.6-stable.tar.xz - # Flutter zum PATH hinzufügen - echo "$(pwd)/flutter/bin" >> /usr/local/bin - # Flutter Doctor ausführen (optional) - flutter doctor -v + # Flutter-Pfad zur PATH-Variable hinzufügen + echo "$(pwd)/flutter/bin" >> $GITHUB_PATH + # Alternativ für Docker/act: + echo "PATH=$(pwd)/flutter/bin:$PATH" >> $GITHUB_ENV - name: Get dependencies run: flutter pub get From e852a4d53976fe0a6a051dfd03169ece057d9392 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:26:34 +0100 Subject: [PATCH 46/89] Added git safe directory --- .gitea/workflows/pull_request.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 62aa58e..a222eff 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -25,6 +25,12 @@ jobs: # Alternativ für Docker/act: echo "PATH=$(pwd)/flutter/bin:$PATH" >> $GITHUB_ENV + - name: Configure Git Safe Directory + run: | + git config --global --add safe.directory /workspace/liquid-development/game-tracker + git config --global --add safe.directory /workspace/liquid-development/game-tracker/flutter + + - name: Get dependencies run: flutter pub get From 601b7d0a4f654bfc8bff848178560c3ddf169ee8 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:36:48 +0100 Subject: [PATCH 47/89] Changed flutter installation --- .gitea/workflows/pull_request.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index a222eff..c8b25e9 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -16,14 +16,11 @@ jobs: apt-get update apt-get install -y jq - - name: Install Flutter - run: | - wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.35.6-stable.tar.xz - tar xf flutter_linux_3.35.6-stable.tar.xz - # Flutter-Pfad zur PATH-Variable hinzufügen - echo "$(pwd)/flutter/bin" >> $GITHUB_PATH - # Alternativ für Docker/act: - echo "PATH=$(pwd)/flutter/bin:$PATH" >> $GITHUB_ENV + - name: Set Up Flutter + uses: flutter-actions/setup-flutter@v2 + with: + flutter-version: '3.35.6' + channel: 'stable' - name: Configure Git Safe Directory run: | From 7ac5986588749d2d55e6eca9225b95900135d088 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:41:12 +0100 Subject: [PATCH 48/89] Updated whole workflow --- .gitea/workflows/pull_request.yaml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index c8b25e9..5338cab 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -11,28 +11,29 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Install jq + - name: Install dependencies run: | apt-get update - apt-get install -y jq + apt-get install -y jq git wget unzip xz-utils - - name: Set Up Flutter - uses: flutter-actions/setup-flutter@v2 - with: - flutter-version: '3.35.6' - channel: 'stable' - - - name: Configure Git Safe Directory + - name: Install Flutter (lokal) run: | - git config --global --add safe.directory /workspace/liquid-development/game-tracker - git config --global --add safe.directory /workspace/liquid-development/game-tracker/flutter + wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz + tar xf flutter_linux_3.38.2-stable.tar.xz + # Git-Safe-Directory für Flutter-Pfad setzen + git config --global --add safe.directory "$(pwd)/flutter" + # Flutter-Pfad setzen + echo "$(pwd)/flutter/bin" >> $GITHUB_PATH + - name: Configure Git Safe Directory (für Projekt) + run: | + git config --global --add safe.directory "$(pwd)" - name: Get dependencies - run: flutter pub get + run: ./flutter/bin/flutter pub get - name: Check Formatting - run: flutter analyze + run: ./flutter/bin/flutter analyze From 6ae1ce9bc71ea90cd231188d315adf2042612bef Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:47:14 +0100 Subject: [PATCH 49/89] Updated analyzing --- .gitea/workflows/pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 5338cab..f44a8f9 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -33,7 +33,7 @@ jobs: run: ./flutter/bin/flutter pub get - name: Check Formatting - run: ./flutter/bin/flutter analyze + run: ./flutter/bin/flutter analyze lib test From 91b68eac3edd02f30b3db38fbee01567b308837b Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:50:56 +0100 Subject: [PATCH 50/89] Implemented test workflow --- .gitea/workflows/pull_request.yaml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index f44a8f9..2dbe146 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -25,9 +25,9 @@ jobs: # Flutter-Pfad setzen echo "$(pwd)/flutter/bin" >> $GITHUB_PATH - - name: Configure Git Safe Directory (für Projekt) - run: | - git config --global --add safe.directory "$(pwd)" + # - name: Configure Git Safe Directory (für Projekt) + # run: | + # git config --global --add safe.directory "$(pwd)" - name: Get dependencies run: ./flutter/bin/flutter pub get @@ -39,25 +39,27 @@ jobs: test: runs-on: ubuntu-latest - needs: lint steps: - name: Checkout code uses: actions/checkout@v4 - - name: Install jq + - name: Install dependencies run: | apt-get update - apt-get install -y jq + apt-get install -y jq git wget unzip xz-utils - - name: Set Up Flutter - uses: subosito/flutter-action@v2 - with: - channel: 'stable' - flutter-version: '3.35.0' + - name: Install Flutter (lokal) + run: | + wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz + tar xf flutter_linux_3.38.2-stable.tar.xz + # Git-Safe-Directory für Flutter-Pfad setzen + git config --global --add safe.directory "$(pwd)/flutter" + # Flutter-Pfad setzen + echo "$(pwd)/flutter/bin" >> $GITHUB_PATH - name: Get dependencies - run: flutter pub get + run: ./flutter/bin/flutter pub get - - name: Run Tests - run: flutter test \ No newline at end of file + - name: Check Formatting + run: ./flutter/bin/flutter test \ No newline at end of file From a3b45053e72108812beaee76feeb0df20eae6d63 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:54:58 +0100 Subject: [PATCH 51/89] Finalized workflow --- .gitea/workflows/pull_request.yaml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 2dbe146..1122252 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -11,12 +11,12 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Install dependencies + - name: Install jq run: | apt-get update - apt-get install -y jq git wget unzip xz-utils + apt-get install -y jq - - name: Install Flutter (lokal) + - name: Install Flutter (wget) run: | wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz tar xf flutter_linux_3.38.2-stable.tar.xz @@ -25,18 +25,12 @@ jobs: # Flutter-Pfad setzen echo "$(pwd)/flutter/bin" >> $GITHUB_PATH - # - name: Configure Git Safe Directory (für Projekt) - # run: | - # git config --global --add safe.directory "$(pwd)" - - name: Get dependencies run: ./flutter/bin/flutter pub get - - name: Check Formatting + - name: Analyze Formatting run: ./flutter/bin/flutter analyze lib test - - test: runs-on: ubuntu-latest @@ -47,9 +41,9 @@ jobs: - name: Install dependencies run: | apt-get update - apt-get install -y jq git wget unzip xz-utils + apt-get install -y jq - - name: Install Flutter (lokal) + - name: Install Flutter (wget) run: | wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz tar xf flutter_linux_3.38.2-stable.tar.xz @@ -61,5 +55,5 @@ jobs: - name: Get dependencies run: ./flutter/bin/flutter pub get - - name: Check Formatting + - name: Run tests run: ./flutter/bin/flutter test \ No newline at end of file From c89243f886d9241fdf26d13b49de2c443e2aafb1 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 10:57:53 +0100 Subject: [PATCH 52/89] Tried sth --- .gitea/workflows/pull_request.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 1122252..187eef9 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -29,7 +29,7 @@ jobs: run: ./flutter/bin/flutter pub get - name: Analyze Formatting - run: ./flutter/bin/flutter analyze lib test + run: flutter analyze lib test test: runs-on: ubuntu-latest @@ -53,7 +53,7 @@ jobs: echo "$(pwd)/flutter/bin" >> $GITHUB_PATH - name: Get dependencies - run: ./flutter/bin/flutter pub get + run: flutter pub get - name: Run tests - run: ./flutter/bin/flutter test \ No newline at end of file + run: flutter test \ No newline at end of file From f136400c7e9bc5e0dde36e9de823a9e665ce6e97 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:01:33 +0100 Subject: [PATCH 53/89] Final changes? --- .gitea/workflows/pull_request.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 187eef9..dcc95c1 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -20,13 +20,13 @@ jobs: run: | wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz tar xf flutter_linux_3.38.2-stable.tar.xz - # Git-Safe-Directory für Flutter-Pfad setzen + # Set Git safe directory for Flutter path git config --global --add safe.directory "$(pwd)/flutter" - # Flutter-Pfad setzen + # Set Flutter path echo "$(pwd)/flutter/bin" >> $GITHUB_PATH - name: Get dependencies - run: ./flutter/bin/flutter pub get + run: flutter pub get - name: Analyze Formatting run: flutter analyze lib test @@ -47,9 +47,9 @@ jobs: run: | wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz tar xf flutter_linux_3.38.2-stable.tar.xz - # Git-Safe-Directory für Flutter-Pfad setzen + # Set Git safe directory for Flutter path git config --global --add safe.directory "$(pwd)/flutter" - # Flutter-Pfad setzen + # Set Flutter path echo "$(pwd)/flutter/bin" >> $GITHUB_PATH - name: Get dependencies From 1732878c7fcb3d64f6ad4c840175ab1737c23bdc Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:03:10 +0100 Subject: [PATCH 54/89] Tested sth --- .gitea/workflows/pull_request.yaml | 42 +++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index dcc95c1..6299f66 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -56,4 +56,44 @@ jobs: run: flutter pub get - name: Run tests - run: flutter test \ No newline at end of file + run: flutter test + + format: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Install dependencies + run: | + apt-get update + apt-get install -y jq + + - name: Install Flutter (wget) + run: | + wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz + tar xf flutter_linux_3.38.2-stable.tar.xz + # Set Git safe directory for Flutter path + git config --global --add safe.directory "$(pwd)/flutter" + # Set Flutter path + echo "$(pwd)/flutter/bin" >> $GITHUB_PATH + + - name: Get & upgrade dependencies + run: | + flutter pub get + flutter pub upgrade --major-versions + + - name: Auto-format + run: | + dart format . + dart fix --apply + + - name: Commit Changes + if: steps.check_changes.outputs.changes_detected == 'true' + run: | + # git config --global user.name "GitHub Actions" + # git config --global user.email "actions@github.com" + git add . + git commit -m "Actions: Auto-formatting [skip ci]" + git push \ No newline at end of file From e5268ebc12d776aaa83f49a8921c86e2d920b388 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:03:10 +0100 Subject: [PATCH 55/89] Tested sth --- .gitea/workflows/pull_request.yaml | 42 +++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index dcc95c1..6299f66 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -56,4 +56,44 @@ jobs: run: flutter pub get - name: Run tests - run: flutter test \ No newline at end of file + run: flutter test + + format: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Install dependencies + run: | + apt-get update + apt-get install -y jq + + - name: Install Flutter (wget) + run: | + wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz + tar xf flutter_linux_3.38.2-stable.tar.xz + # Set Git safe directory for Flutter path + git config --global --add safe.directory "$(pwd)/flutter" + # Set Flutter path + echo "$(pwd)/flutter/bin" >> $GITHUB_PATH + + - name: Get & upgrade dependencies + run: | + flutter pub get + flutter pub upgrade --major-versions + + - name: Auto-format + run: | + dart format . + dart fix --apply + + - name: Commit Changes + if: steps.check_changes.outputs.changes_detected == 'true' + run: | + # git config --global user.name "GitHub Actions" + # git config --global user.email "actions@github.com" + git add . + git commit -m "Actions: Auto-formatting [skip ci]" + git push \ No newline at end of file From 594ea947c2e074236935541e9d5aa67d8b9d11a5 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:06:40 +0100 Subject: [PATCH 56/89] Tested sth --- .gitea/workflows/pull_request.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 6299f66..01a3780 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -6,7 +6,6 @@ on: jobs: lint: runs-on: ubuntu-latest - container: node:18-bullseye steps: - name: Checkout code uses: actions/checkout@v4 @@ -33,7 +32,6 @@ jobs: test: runs-on: ubuntu-latest - steps: - name: Checkout code uses: actions/checkout@v4 @@ -60,7 +58,6 @@ jobs: format: runs-on: ubuntu-latest - steps: - name: Checkout code uses: actions/checkout@v4 From 346dddcf62ec7bdd82858ccb256bc6f20d2f3fed Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:08:01 +0100 Subject: [PATCH 57/89] testing formatting --- .gitea/workflows/pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 22e794d..0e075d5 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -86,7 +86,7 @@ jobs: - name: Auto-format run: | dart format . - dart fix --apply + dart fix --apply - name: Commit Changes if: steps.check_changes.outputs.changes_detected == 'true' From dd8af42a472568178efca2103d14ab5b5c20c7e9 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:08:30 +0100 Subject: [PATCH 58/89] corrected workflow --- .gitea/workflows/pull_request.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 0e075d5..d30f3fe 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -91,8 +91,6 @@ jobs: - name: Commit Changes if: steps.check_changes.outputs.changes_detected == 'true' run: | - # git config --global user.name "GitHub Actions" - # git config --global user.email "actions@github.com" git add . git commit -m "Actions: Auto-formatting [skip ci]" - git push \ No newline at end of file + git push From 5d8047b3ba4a59e1743e5d4ae5b9315dd792da2c Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:12:02 +0100 Subject: [PATCH 59/89] Updated directorys --- .gitea/workflows/pull_request.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index d30f3fe..89bf9df 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -60,6 +60,7 @@ jobs: format: runs-on: ubuntu-latest + if: false # steps: - name: Checkout code uses: actions/checkout@v4 @@ -85,8 +86,8 @@ jobs: - name: Auto-format run: | - dart format . - dart fix --apply + dart format lib test + dart fix --apply lib test - name: Commit Changes if: steps.check_changes.outputs.changes_detected == 'true' From 89d7bb54a1bf16f5da98fe32ff0d0c8cd4d44c25 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:12:46 +0100 Subject: [PATCH 60/89] Removed false --- .gitea/workflows/pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 89bf9df..c4504a6 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -60,7 +60,7 @@ jobs: format: runs-on: ubuntu-latest - if: false # + # if: false # Needs bot user steps: - name: Checkout code uses: actions/checkout@v4 From 81cdeb7ed6a29edda6bb1069d35646f150ccdf8e Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:15:30 +0100 Subject: [PATCH 61/89] Skipped other runs for testing --- .gitea/workflows/pull_request.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index c4504a6..1c8e4d3 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -5,6 +5,7 @@ on: jobs: lint: + if: false runs-on: ubuntu-latest container: node:18-bullseye steps: @@ -32,8 +33,8 @@ jobs: run: flutter analyze lib test test: + if: false runs-on: ubuntu-latest - steps: - name: Checkout code uses: actions/checkout@v4 @@ -86,8 +87,8 @@ jobs: - name: Auto-format run: | - dart format lib test - dart fix --apply lib test + dart format lib + dart fix --apply lib - name: Commit Changes if: steps.check_changes.outputs.changes_detected == 'true' From 0659d202b3d90c01c0d3ebe4a58e46b34615a3ac Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:18:23 +0100 Subject: [PATCH 62/89] Remove if clause --- .gitea/workflows/pull_request.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 1c8e4d3..7f85a05 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -91,7 +91,6 @@ jobs: dart fix --apply lib - name: Commit Changes - if: steps.check_changes.outputs.changes_detected == 'true' run: | git add . git commit -m "Actions: Auto-formatting [skip ci]" From aade42c0a600a63ac75cbaa548649dcc163d88ce Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:21:43 +0100 Subject: [PATCH 63/89] Tried sth --- .gitea/workflows/pull_request.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 7f85a05..58f29e5 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -87,11 +87,13 @@ jobs: - name: Auto-format run: | - dart format lib + dart format lib dart fix --apply lib - name: Commit Changes run: | - git add . + git status + git add lib/ + git status git commit -m "Actions: Auto-formatting [skip ci]" git push From ca4bf03bab19910730ad3bbddffb51fe13596e4c Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:27:48 +0100 Subject: [PATCH 64/89] Finalized pull request workflow --- .gitea/workflows/pull_request.yaml | 44 +----------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml index 58f29e5..43d36d2 100644 --- a/.gitea/workflows/pull_request.yaml +++ b/.gitea/workflows/pull_request.yaml @@ -5,9 +5,7 @@ on: jobs: lint: - if: false runs-on: ubuntu-latest - container: node:18-bullseye steps: - name: Checkout code uses: actions/checkout@v4 @@ -33,7 +31,6 @@ jobs: run: flutter analyze lib test test: - if: false runs-on: ubuntu-latest steps: - name: Checkout code @@ -57,43 +54,4 @@ jobs: run: flutter pub get - name: Run tests - run: flutter test - - format: - runs-on: ubuntu-latest - # if: false # Needs bot user - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Install dependencies - run: | - apt-get update - apt-get install -y jq - - - name: Install Flutter (wget) - run: | - wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz - tar xf flutter_linux_3.38.2-stable.tar.xz - # Set Git safe directory for Flutter path - git config --global --add safe.directory "$(pwd)/flutter" - # Set Flutter path - echo "$(pwd)/flutter/bin" >> $GITHUB_PATH - - - name: Get & upgrade dependencies - run: | - flutter pub get - flutter pub upgrade --major-versions - - - name: Auto-format - run: | - dart format lib - dart fix --apply lib - - - name: Commit Changes - run: | - git status - git add lib/ - git status - git commit -m "Actions: Auto-formatting [skip ci]" - git push + run: flutter test \ No newline at end of file From 74fffa95e287cc0b2df5e778fb461fb81ebfd54c Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:28:00 +0100 Subject: [PATCH 65/89] Added push workflow (not active) --- .gitea/workflows/push.yaml | 48 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .gitea/workflows/push.yaml diff --git a/.gitea/workflows/push.yaml b/.gitea/workflows/push.yaml new file mode 100644 index 0000000..7a6bb0b --- /dev/null +++ b/.gitea/workflows/push.yaml @@ -0,0 +1,48 @@ +name: Pull Request Pipeline + +on: + push: + branches: + - "development" + - "main" + +jobs: + format: + runs-on: ubuntu-latest + if: false # Needs bot user + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Install dependencies + run: | + apt-get update + apt-get install -y jq + + - name: Install Flutter (wget) + run: | + wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz + tar xf flutter_linux_3.38.2-stable.tar.xz + # Set Git safe directory for Flutter path + git config --global --add safe.directory "$(pwd)/flutter" + # Set Flutter path + echo "$(pwd)/flutter/bin" >> $GITHUB_PATH + + - name: Get & upgrade dependencies + run: | + flutter pub get + flutter pub upgrade --major-versions + + - name: Auto-format + run: | + dart format lib + dart fix --apply lib + + # Needs credentials, push access and the right files need to be staged + - name: Commit Changes + run: | + git status + git add lib/ + git status + git commit -m "Actions: Auto-formatting [skip ci]" + git push From 0ac8c2105260328c506cdd39ee18d0301124d1cd Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 11:32:22 +0100 Subject: [PATCH 66/89] Formatted files so that pipeline doesnt fail --- .../views/main_menu/game_history_view.dart | 22 ++++++++--------- .../widgets/double_row_info_tile.dart | 24 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/presentation/views/main_menu/game_history_view.dart b/lib/presentation/views/main_menu/game_history_view.dart index 3642a88..90cc50a 100644 --- a/lib/presentation/views/main_menu/game_history_view.dart +++ b/lib/presentation/views/main_menu/game_history_view.dart @@ -134,16 +134,16 @@ class _GameHistoryViewState extends State { children: [ Column( children: [ - Container(margin: EdgeInsets.only(bottom: 75)), + Container(margin: const EdgeInsets.only(bottom: 75)), Expanded( child: gameHistoryListView(allGameData, suggestedGameData), ), ], ), Container( - margin: EdgeInsets.only(top: 10, bottom: 10, left: 10, right: 10), + margin: const EdgeInsets.only(top: 10, bottom: 10, left: 10, right: 10), child: SearchBar( - leading: Icon(Icons.search), + leading: const Icon(Icons.search), onChanged: (value) { if (value.isEmpty) { setState(() { @@ -178,16 +178,16 @@ class _GameHistoryViewState extends State { Widget gameHistoryListView(allGameData, suggestedGameData) { if (suggestedGameData.isEmpty && allGameData.isEmpty) { - return TopCenteredMessage( + return const TopCenteredMessage( icon: Icons.info, - title: "Info", - message: "Keine Spiele erstellt", + title: 'Info', + message: 'Keine Spiele erstellt', ); } else if (suggestedGameData.isEmpty) { - return TopCenteredMessage( + return const TopCenteredMessage( icon: Icons.search, - title: "Info", - message: "Kein Spiel mit den Suchparametern gefunden.", + title: 'Info', + message: 'Kein Spiel mit den Suchparametern gefunden.', ); } return ListView.builder( @@ -195,9 +195,9 @@ Widget gameHistoryListView(allGameData, suggestedGameData) { itemBuilder: (context, index) { final currentGame = suggestedGameData[index]; return doubleRowInfoTile( - currentGame['game'] + ": ", + currentGame['game'] + ': ', currentGame['title'], - currentGame['players'].toString() + " Spieler", + "${currentGame['players']} Spieler", currentGame['group'], currentGame['date'], ); diff --git a/lib/presentation/widgets/double_row_info_tile.dart b/lib/presentation/widgets/double_row_info_tile.dart index 621cc74..57404ff 100644 --- a/lib/presentation/widgets/double_row_info_tile.dart +++ b/lib/presentation/widgets/double_row_info_tile.dart @@ -9,8 +9,8 @@ Widget doubleRowInfoTile( String titleLowerRight, ) { return Container( - margin: EdgeInsets.symmetric(vertical: 5, horizontal: 10), - padding: EdgeInsets.all(10), + margin: const EdgeInsets.symmetric(vertical: 5, horizontal: 10), + padding: const EdgeInsets.all(10), decoration: BoxDecoration( borderRadius: BorderRadius.circular(20), color: CustomTheme.secondaryColor, @@ -22,18 +22,18 @@ Widget doubleRowInfoTile( Expanded( flex: 10, child: Text( - "$titleOneUpperLeft $titleTwoUpperLeft", - style: TextStyle(fontSize: 20), + '$titleOneUpperLeft $titleTwoUpperLeft', + style: const TextStyle(fontSize: 20), overflow: TextOverflow.ellipsis, maxLines: 1, ), ), - Spacer(), + const Spacer(), Expanded( flex: 3, child: Text( - "$titleUpperRight", - style: TextStyle(fontSize: 20), + titleUpperRight, + style: const TextStyle(fontSize: 20), overflow: TextOverflow.ellipsis, maxLines: 1, textAlign: TextAlign.end, @@ -46,18 +46,18 @@ Widget doubleRowInfoTile( Expanded( flex: 10, child: Text( - "$titleLowerLeft", - style: TextStyle(fontSize: 20), + titleLowerLeft, + style: const TextStyle(fontSize: 20), overflow: TextOverflow.ellipsis, maxLines: 1, ), ), - Spacer(), + const Spacer(), Expanded( flex: 4, child: Text( - "$titleLowerRight", - style: TextStyle(fontSize: 20), + titleLowerRight, + style: const TextStyle(fontSize: 20), overflow: TextOverflow.ellipsis, maxLines: 1, textAlign: TextAlign.end, From c76e193b4d63396877e2a1af8b4a57e0f31bb9f6 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 19 Nov 2025 15:02:32 +0100 Subject: [PATCH 67/89] created all objects in setup() funktion to avoid redundant withClock --- test/db_tests/game_test.dart | 51 +++++++++++------------- test/db_tests/group_test.dart | 71 ++++++++++++++++------------------ test/db_tests/player_test.dart | 49 +++++++++++------------ 3 files changed, 79 insertions(+), 92 deletions(-) diff --git a/test/db_tests/game_test.dart b/test/db_tests/game_test.dart index 0c86e45..d726425 100644 --- a/test/db_tests/game_test.dart +++ b/test/db_tests/game_test.dart @@ -51,41 +51,36 @@ void main() { group('game tests', () { test('game is added correctly', () async { - await withClock(fakeClock, () async { - await database.gameDao.addGame(game: testgame); + await database.gameDao.addGame(game: testgame); - final result = await database.gameDao.getGameById(gameId: testgame.id); + final result = await database.gameDao.getGameById(gameId: testgame.id); - expect(result.id, testgame.id); - expect(result.name, testgame.name); - expect(result.winner, testgame.winner); - expect(result.createdAt, testgame.createdAt); + expect(result.id, testgame.id); + expect(result.name, testgame.name); + expect(result.winner, testgame.winner); + expect(result.createdAt, testgame.createdAt); - if (result.group != null) { - expect(result.group!.members.length, testgroup.members.length); + if (result.group != null) { + expect(result.group!.members.length, testgroup.members.length); - for (int i = 0; i < testgroup.members.length; i++) { - expect(result.group!.members[i].id, testgroup.members[i].id); - expect(result.group!.members[i].name, testgroup.members[i].name); - } - } else { - fail('Group is null'); + for (int i = 0; i < testgroup.members.length; i++) { + expect(result.group!.members[i].id, testgroup.members[i].id); + expect(result.group!.members[i].name, testgroup.members[i].name); } - if (result.players != null) { - expect(result.players!.length, testgame.players!.length); + } else { + fail('Group is null'); + } + if (result.players != null) { + expect(result.players!.length, testgame.players!.length); - for (int i = 0; i < testgame.players!.length; i++) { - expect(result.players![i].id, testgame.players![i].id); - expect(result.players![i].name, testgame.players![i].name); - expect( - result.players![i].createdAt, - testgame.players![i].createdAt, - ); - } - } else { - fail('Players is null'); + for (int i = 0; i < testgame.players!.length; i++) { + expect(result.players![i].id, testgame.players![i].id); + expect(result.players![i].name, testgame.players![i].name); + expect(result.players![i].createdAt, testgame.players![i].createdAt); } - }); + } else { + fail('Players is null'); + } }); test('game is deleted correctly', () async { diff --git a/test/db_tests/group_test.dart b/test/db_tests/group_test.dart index 5730617..1241419 100644 --- a/test/db_tests/group_test.dart +++ b/test/db_tests/group_test.dart @@ -13,6 +13,7 @@ void main() { late Player player3; late Player player4; late Group testgroup; + late Group testgroup2; final fixedDate = DateTime(2025, 19, 11, 00, 11, 23); final fakeClock = Clock(() => fixedDate); @@ -34,6 +35,11 @@ void main() { name: 'Test Group', members: [player1, player2, player3], ); + testgroup2 = Group( + id: 'gr2', + name: 'Second Group', + members: [player2, player3, player4], + ); }); }); tearDown(() async { @@ -41,53 +47,42 @@ void main() { }); group('group tests', () { test('all groups get fetched correctly', () async { - await withClock(fakeClock, () async { - final testgroup2 = Group( - id: 'gr2', - name: 'Second Group', - members: [player2, player3, player4], - ); - await database.groupDao.addGroup(group: testgroup); - await database.groupDao.addGroup(group: testgroup2); + await database.groupDao.addGroup(group: testgroup); + await database.groupDao.addGroup(group: testgroup2); - final allGroups = await database.groupDao.getAllGroups(); - expect(allGroups.length, 2); + final allGroups = await database.groupDao.getAllGroups(); + expect(allGroups.length, 2); - final fetchedGroup1 = allGroups.firstWhere((g) => g.id == testgroup.id); - expect(fetchedGroup1.name, testgroup.name); - expect(fetchedGroup1.members.length, testgroup.members.length); - expect(fetchedGroup1.members.elementAt(0).id, player1.id); - expect(fetchedGroup1.members.elementAt(0).createdAt, player1.createdAt); + final fetchedGroup1 = allGroups.firstWhere((g) => g.id == testgroup.id); + expect(fetchedGroup1.name, testgroup.name); + expect(fetchedGroup1.members.length, testgroup.members.length); + expect(fetchedGroup1.members.elementAt(0).id, player1.id); + expect(fetchedGroup1.members.elementAt(0).createdAt, player1.createdAt); - final fetchedGroup2 = allGroups.firstWhere( - (g) => g.id == testgroup2.id, - ); - expect(fetchedGroup2.name, testgroup2.name); - expect(fetchedGroup2.members.length, testgroup2.members.length); - expect(fetchedGroup2.members.elementAt(0).id, player2.id); - expect(fetchedGroup2.members.elementAt(0).createdAt, player2.createdAt); - }); + final fetchedGroup2 = allGroups.firstWhere((g) => g.id == testgroup2.id); + expect(fetchedGroup2.name, testgroup2.name); + expect(fetchedGroup2.members.length, testgroup2.members.length); + expect(fetchedGroup2.members.elementAt(0).id, player2.id); + expect(fetchedGroup2.members.elementAt(0).createdAt, player2.createdAt); }); test('group and group members gets added correctly', () async { - await withClock(fakeClock, () async { - await database.groupDao.addGroup(group: testgroup); + await database.groupDao.addGroup(group: testgroup); - final result = await database.groupDao.getGroupById( - groupId: testgroup.id, - ); + final result = await database.groupDao.getGroupById( + groupId: testgroup.id, + ); - expect(result.id, testgroup.id); - expect(result.name, testgroup.name); - expect(result.createdAt, testgroup.createdAt); + expect(result.id, testgroup.id); + expect(result.name, testgroup.name); + expect(result.createdAt, testgroup.createdAt); - expect(result.members.length, testgroup.members.length); - for (int i = 0; i < testgroup.members.length; i++) { - expect(result.members[i].id, testgroup.members[i].id); - expect(result.members[i].name, testgroup.members[i].name); - expect(result.members[i].createdAt, testgroup.members[i].createdAt); - } - }); + expect(result.members.length, testgroup.members.length); + for (int i = 0; i < testgroup.members.length; i++) { + expect(result.members[i].id, testgroup.members[i].id); + expect(result.members[i].name, testgroup.members[i].name); + expect(result.members[i].createdAt, testgroup.members[i].createdAt); + } }); test('group gets deleted correctly', () async { diff --git a/test/db_tests/player_test.dart b/test/db_tests/player_test.dart index ce75297..fa65f67 100644 --- a/test/db_tests/player_test.dart +++ b/test/db_tests/player_test.dart @@ -8,6 +8,7 @@ import 'package:game_tracker/data/dto/player.dart'; void main() { late AppDatabase database; late Player testPlayer; + late Player testPlayer2; final fixedDate = DateTime(2025, 19, 11, 00, 11, 23); final fakeClock = Clock(() => fixedDate); @@ -22,6 +23,7 @@ void main() { withClock(fakeClock, () { testPlayer = Player(name: 'Test Player'); + testPlayer2 = Player(name: 'Second Group'); }); }); tearDown(() async { @@ -30,39 +32,34 @@ void main() { group('player tests', () { test('all players get fetched correctly', () async { - await withClock(fakeClock, () async { - final testPlayer2 = Player(name: 'Second Group'); - await database.playerDao.addPlayer(player: testPlayer); - await database.playerDao.addPlayer(player: testPlayer2); + await database.playerDao.addPlayer(player: testPlayer); + await database.playerDao.addPlayer(player: testPlayer2); - final allPlayers = await database.playerDao.getAllPlayers(); - expect(allPlayers.length, 2); + final allPlayers = await database.playerDao.getAllPlayers(); + expect(allPlayers.length, 2); - final fetchedPlayer1 = allPlayers.firstWhere( - (g) => g.id == testPlayer.id, - ); - expect(fetchedPlayer1.name, testPlayer.name); - expect(fetchedPlayer1.createdAt, testPlayer.createdAt); + final fetchedPlayer1 = allPlayers.firstWhere( + (g) => g.id == testPlayer.id, + ); + expect(fetchedPlayer1.name, testPlayer.name); + expect(fetchedPlayer1.createdAt, testPlayer.createdAt); - final fetchedPlayer2 = allPlayers.firstWhere( - (g) => g.id == testPlayer2.id, - ); - expect(fetchedPlayer2.name, testPlayer2.name); - expect(fetchedPlayer2.createdAt, testPlayer2.createdAt); - }); + final fetchedPlayer2 = allPlayers.firstWhere( + (g) => g.id == testPlayer2.id, + ); + expect(fetchedPlayer2.name, testPlayer2.name); + expect(fetchedPlayer2.createdAt, testPlayer2.createdAt); }); test('players get inserted correcly ', () async { - await withClock(fakeClock, () async { - await database.playerDao.addPlayer(player: testPlayer); - final result = await database.playerDao.getPlayerById( - playerId: testPlayer.id, - ); + await database.playerDao.addPlayer(player: testPlayer); + final result = await database.playerDao.getPlayerById( + playerId: testPlayer.id, + ); - expect(result.id, testPlayer.id); - expect(result.name, testPlayer.name); - expect(result.createdAt, testPlayer.createdAt); - }); + expect(result.id, testPlayer.id); + expect(result.name, testPlayer.name); + expect(result.createdAt, testPlayer.createdAt); }); test('players get deleted correcly ', () async { From b82261317c87c14b0001c8f3fd457373bc5cbd4f Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 19 Nov 2025 15:09:40 +0100 Subject: [PATCH 68/89] move CreateGroupView to main_menu directory --- .../views/main_menu/{create_group => }/create_group_view.dart | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename lib/presentation/views/main_menu/{create_group => }/create_group_view.dart (100%) diff --git a/lib/presentation/views/main_menu/create_group/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart similarity index 100% rename from lib/presentation/views/main_menu/create_group/create_group_view.dart rename to lib/presentation/views/main_menu/create_group_view.dart From 98b02adc85a8d8958596ff28fa93934d843970e2 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 15:43:49 +0100 Subject: [PATCH 69/89] Formatted files so that pipeline doesnt fail --- .gitea/workflows/push.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/push.yaml b/.gitea/workflows/push.yaml index 7a6bb0b..c5afb83 100644 --- a/.gitea/workflows/push.yaml +++ b/.gitea/workflows/push.yaml @@ -41,7 +41,9 @@ jobs: # Needs credentials, push access and the right files need to be staged - name: Commit Changes run: | - git status + git config --global user.name "Gitea Actions" + git config --global user.email "actions@gitea.com" + git status git add lib/ git status git commit -m "Actions: Auto-formatting [skip ci]" From 3b6a91402290ca5b51bb19728d19c4c462d963a3 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 19 Nov 2025 15:52:04 +0100 Subject: [PATCH 70/89] removed uneccessary withClock --- test/db_tests/group_test.dart | 48 ++++++++++++++++------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/test/db_tests/group_test.dart b/test/db_tests/group_test.dart index 1241419..a076ab0 100644 --- a/test/db_tests/group_test.dart +++ b/test/db_tests/group_test.dart @@ -116,39 +116,35 @@ void main() { }); test('Adding player to group works correctly', () async { - await withClock(fakeClock, () async { - await database.groupDao.addGroup(group: testgroup); + await database.groupDao.addGroup(group: testgroup); - await database.playerGroupDao.addPlayerToGroup( - player: player4, - groupId: testgroup.id, - ); + await database.playerGroupDao.addPlayerToGroup( + player: player4, + groupId: testgroup.id, + ); - final playerAdded = await database.playerGroupDao.isPlayerInGroup( - playerId: player4.id, - groupId: testgroup.id, - ); + final playerAdded = await database.playerGroupDao.isPlayerInGroup( + playerId: player4.id, + groupId: testgroup.id, + ); - expect(playerAdded, true); + expect(playerAdded, true); - final playerNotAdded = !await database.playerGroupDao.isPlayerInGroup( - playerId: '', - groupId: testgroup.id, - ); + final playerNotAdded = !await database.playerGroupDao.isPlayerInGroup( + playerId: '', + groupId: testgroup.id, + ); - expect(playerNotAdded, true); + expect(playerNotAdded, true); - final result = await database.groupDao.getGroupById( - groupId: testgroup.id, - ); - expect(result.members.length, testgroup.members.length + 1); + final result = await database.groupDao.getGroupById( + groupId: testgroup.id, + ); + expect(result.members.length, testgroup.members.length + 1); - final addedPlayer = result.members.firstWhere( - (p) => p.id == player4.id, - ); - expect(addedPlayer.name, player4.name); - expect(addedPlayer.createdAt, player4.createdAt); - }); + final addedPlayer = result.members.firstWhere((p) => p.id == player4.id); + expect(addedPlayer.name, player4.name); + expect(addedPlayer.createdAt, player4.createdAt); }); test('Removing player from group works correctly', () async { From 54e1756e79326324205acba4874fd0e12b14e88a Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 19 Nov 2025 16:39:05 +0100 Subject: [PATCH 71/89] moved create_group_view from subfolder to root --- lib/presentation/views/main_menu/groups_view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/views/main_menu/groups_view.dart b/lib/presentation/views/main_menu/groups_view.dart index 7e6f59d..f74d20c 100644 --- a/lib/presentation/views/main_menu/groups_view.dart +++ b/lib/presentation/views/main_menu/groups_view.dart @@ -3,7 +3,7 @@ import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/player.dart'; -import 'package:game_tracker/presentation/views/main_menu/create_group/create_group_view.dart'; +import 'package:game_tracker/presentation/views/main_menu/create_group_view.dart'; import 'package:game_tracker/presentation/widgets/custom_width_button.dart'; import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart'; import 'package:game_tracker/presentation/widgets/top_centered_message.dart'; From 9365313c9215a5ad77f2a16b8c2c05f7dad03ad9 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 19 Nov 2025 16:39:32 +0100 Subject: [PATCH 72/89] button not working --- .../views/main_menu/create_group_view.dart | 7 ++- .../widgets/custom_width_button.dart | 46 ++++++++++++++----- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart index 81d5e36..f43fc8d 100644 --- a/lib/presentation/views/main_menu/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group_view.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:flutter/material.dart' hide ButtonStyle; import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/dto/group.dart'; @@ -265,8 +265,8 @@ class _CreateGroupViewState extends State { ), CustomWidthButton( text: 'Create group', - disabledInfillColor: CustomTheme.boxColor, sizeRelativeToWidth: 0.95, + buttonStyle: ButtonStyle.secondary, onPressed: (_groupNameController.text.isEmpty || selectedPlayers.isEmpty) ? null @@ -277,14 +277,13 @@ class _CreateGroupViewState extends State { members: selectedPlayers, ), ); + if (!context.mounted) return; if (success) { _groupNameController.clear(); _searchBarController.clear(); selectedPlayers.clear(); - if (!mounted) return; Navigator.pop(context); } else { - if (!mounted) return; ScaffoldMessenger.of(context).showSnackBar( SnackBar( backgroundColor: CustomTheme.boxColor, diff --git a/lib/presentation/widgets/custom_width_button.dart b/lib/presentation/widgets/custom_width_button.dart index b0b9bd3..2a79d1b 100644 --- a/lib/presentation/widgets/custom_width_button.dart +++ b/lib/presentation/widgets/custom_width_button.dart @@ -7,45 +7,67 @@ class CustomWidthButton extends StatelessWidget { const CustomWidthButton({ super.key, required this.text, - this.disabledInfillColor, this.buttonStyle = ButtonStyle.primary, required this.sizeRelativeToWidth, - required this.onPressed, + this.onPressed, }); final String text; - final Color? disabledInfillColor; final double sizeRelativeToWidth; final VoidCallback? onPressed; final ButtonStyle buttonStyle; @override Widget build(BuildContext context) { + + final Color buttonBackgroundColor; + final Color disabledBackgroundColor; + final Color borderSideColor; + final Color disabledBorderSideColor; + final Color textcolor; + final Color disabledTextColor; + + + if(buttonStyle == ButtonStyle.primary){ + buttonBackgroundColor = CustomTheme.primaryColor; + disabledBackgroundColor = CustomTheme.primaryColor.withValues(alpha: 0.24); + borderSideColor = Colors.transparent; + disabledBorderSideColor = Colors.transparent; + textcolor = Colors.white; + disabledTextColor = Colors.white.withValues(alpha: 0.24); + } else{ + buttonBackgroundColor = Colors.transparent; + disabledBackgroundColor = Colors.transparent; + borderSideColor = CustomTheme.primaryColor.withValues(alpha: 0.6 ); + disabledBorderSideColor = Colors.transparent; + textcolor = CustomTheme.primaryColor; + disabledTextColor = CustomTheme.primaryColor.withValues(alpha: 0.24); + } + + return ElevatedButton( onPressed: onPressed, style: ElevatedButton.styleFrom( - disabledBackgroundColor: disabledInfillColor, + disabledBackgroundColor: disabledBackgroundColor, minimumSize: Size( MediaQuery.sizeOf(context).width * sizeRelativeToWidth, 60, ), - backgroundColor: buttonStyle == ButtonStyle.primary - ? CustomTheme.primaryColor - : CustomTheme.secondaryColor, + backgroundColor: buttonBackgroundColor, side: BorderSide( - color: buttonStyle == ButtonStyle.primary - ? CustomTheme.primaryColor - : CustomTheme.secondaryColor, + color: borderSideColor, width: 2, ), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), ), child: Text( text, - style: const TextStyle( + style: TextStyle( fontWeight: FontWeight.w500, fontSize: 22, - color: Colors.white, + color: (onPressed == null) + ? disabledTextColor + : textcolor, ), ), ); From 201fd70685c2d7040db9c9d0533254db2bef0dd6 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 19 Nov 2025 16:44:46 +0100 Subject: [PATCH 73/89] Update `TextIconListTile` padding and replace `IconButton` with `GestureDetector` --- lib/presentation/widgets/tiles/text_icon_list_tile.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/presentation/widgets/tiles/text_icon_list_tile.dart b/lib/presentation/widgets/tiles/text_icon_list_tile.dart index 92d0251..1907928 100644 --- a/lib/presentation/widgets/tiles/text_icon_list_tile.dart +++ b/lib/presentation/widgets/tiles/text_icon_list_tile.dart @@ -17,7 +17,7 @@ class TextIconListTile extends StatelessWidget { Widget build(BuildContext context) { return Container( margin: const EdgeInsets.symmetric(horizontal: 5, vertical: 5), - padding: const EdgeInsets.symmetric(horizontal: 10), + padding: const EdgeInsets.symmetric(horizontal: 15), decoration: BoxDecoration( color: CustomTheme.boxColor, border: Border.all(color: CustomTheme.boxBorder), @@ -41,9 +41,9 @@ class TextIconListTile extends StatelessWidget { ), ), if (iconEnabled) - IconButton( - icon: const Icon(Icons.add, size: 20), - onPressed: onPressed, + GestureDetector( + child: const Icon(Icons.add, size: 20), + onTap: onPressed, ), ], ), From 018332d8e603cabe5ab6ee6e46770fd1e16a595c Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 19 Nov 2025 16:48:43 +0100 Subject: [PATCH 74/89] Refactor widget directory structure by organizing tiles and buttons - Move `GameTile` and `DoubleRowInfoTile` to `presentation/widgets/tiles/` - Move `CustomWidthButton` and `QuickCreateButton` to `presentation/widgets/buttons/` - Update import paths in `HomeView`, `GroupsView`, `GameHistoryView`, and `CreateGroupView` --- lib/presentation/views/main_menu/create_group_view.dart | 2 +- lib/presentation/views/main_menu/game_history_view.dart | 2 +- lib/presentation/views/main_menu/groups_view.dart | 2 +- lib/presentation/views/main_menu/home_view.dart | 4 ++-- .../widgets/{ => buttons}/custom_width_button.dart | 0 .../widgets/{ => buttons}/quick_create_button.dart | 0 .../widgets/{ => tiles}/double_row_info_tile.dart | 0 lib/presentation/widgets/{ => tiles}/game_tile.dart | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename lib/presentation/widgets/{ => buttons}/custom_width_button.dart (100%) rename lib/presentation/widgets/{ => buttons}/quick_create_button.dart (100%) rename lib/presentation/widgets/{ => tiles}/double_row_info_tile.dart (100%) rename lib/presentation/widgets/{ => tiles}/game_tile.dart (100%) diff --git a/lib/presentation/views/main_menu/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart index f43fc8d..365cf27 100644 --- a/lib/presentation/views/main_menu/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group_view.dart @@ -3,8 +3,8 @@ import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/player.dart'; +import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart'; import 'package:game_tracker/presentation/widgets/custom_search_bar.dart'; -import 'package:game_tracker/presentation/widgets/custom_width_button.dart'; import 'package:game_tracker/presentation/widgets/text_input_field.dart'; import 'package:game_tracker/presentation/widgets/tiles/text_icon_list_tile.dart'; import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart'; diff --git a/lib/presentation/views/main_menu/game_history_view.dart b/lib/presentation/views/main_menu/game_history_view.dart index 3642a88..7c19bbf 100644 --- a/lib/presentation/views/main_menu/game_history_view.dart +++ b/lib/presentation/views/main_menu/game_history_view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; -import 'package:game_tracker/presentation/widgets/double_row_info_tile.dart'; +import 'package:game_tracker/presentation/widgets/tiles/double_row_info_tile.dart'; import 'package:game_tracker/presentation/widgets/top_centered_message.dart'; class GameHistoryView extends StatefulWidget { diff --git a/lib/presentation/views/main_menu/groups_view.dart b/lib/presentation/views/main_menu/groups_view.dart index f74d20c..c45cf21 100644 --- a/lib/presentation/views/main_menu/groups_view.dart +++ b/lib/presentation/views/main_menu/groups_view.dart @@ -4,7 +4,7 @@ import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/player.dart'; import 'package:game_tracker/presentation/views/main_menu/create_group_view.dart'; -import 'package:game_tracker/presentation/widgets/custom_width_button.dart'; +import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart'; import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart'; import 'package:game_tracker/presentation/widgets/top_centered_message.dart'; import 'package:provider/provider.dart'; diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index cf6288a..34e4be3 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/data/db/database.dart'; -import 'package:game_tracker/presentation/widgets/game_tile.dart'; -import 'package:game_tracker/presentation/widgets/quick_create_button.dart'; +import 'package:game_tracker/presentation/widgets/buttons/quick_create_button.dart'; +import 'package:game_tracker/presentation/widgets/tiles/game_tile.dart'; import 'package:game_tracker/presentation/widgets/tiles/info_tile.dart'; import 'package:game_tracker/presentation/widgets/tiles/quick_info_tile.dart'; import 'package:provider/provider.dart'; diff --git a/lib/presentation/widgets/custom_width_button.dart b/lib/presentation/widgets/buttons/custom_width_button.dart similarity index 100% rename from lib/presentation/widgets/custom_width_button.dart rename to lib/presentation/widgets/buttons/custom_width_button.dart diff --git a/lib/presentation/widgets/quick_create_button.dart b/lib/presentation/widgets/buttons/quick_create_button.dart similarity index 100% rename from lib/presentation/widgets/quick_create_button.dart rename to lib/presentation/widgets/buttons/quick_create_button.dart diff --git a/lib/presentation/widgets/double_row_info_tile.dart b/lib/presentation/widgets/tiles/double_row_info_tile.dart similarity index 100% rename from lib/presentation/widgets/double_row_info_tile.dart rename to lib/presentation/widgets/tiles/double_row_info_tile.dart diff --git a/lib/presentation/widgets/game_tile.dart b/lib/presentation/widgets/tiles/game_tile.dart similarity index 100% rename from lib/presentation/widgets/game_tile.dart rename to lib/presentation/widgets/tiles/game_tile.dart From 1232cb8f0dc259c4c4105030fe25255c14683a06 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 19 Nov 2025 16:50:02 +0100 Subject: [PATCH 75/89] Fix `GestureDetector` child ordering in `TextIconListTile` --- lib/presentation/widgets/tiles/text_icon_list_tile.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/widgets/tiles/text_icon_list_tile.dart b/lib/presentation/widgets/tiles/text_icon_list_tile.dart index 1907928..c0fe673 100644 --- a/lib/presentation/widgets/tiles/text_icon_list_tile.dart +++ b/lib/presentation/widgets/tiles/text_icon_list_tile.dart @@ -42,8 +42,8 @@ class TextIconListTile extends StatelessWidget { ), if (iconEnabled) GestureDetector( - child: const Icon(Icons.add, size: 20), onTap: onPressed, + child: const Icon(Icons.add, size: 20), ), ], ), From 3f79a7b89826b60fd33712cb016418507da1b292 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 18:26:51 +0100 Subject: [PATCH 76/89] sourcing enums out to enums.dart --- lib/core/enums.dart | 2 ++ lib/presentation/views/main_menu/create_group_view.dart | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 lib/core/enums.dart diff --git a/lib/core/enums.dart b/lib/core/enums.dart new file mode 100644 index 0000000..320eaf7 --- /dev/null +++ b/lib/core/enums.dart @@ -0,0 +1,2 @@ +/// Button types used for styling the [CustomWidthButton] +enum ButtonType { primary, secondary, tertiary } diff --git a/lib/presentation/views/main_menu/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart index 365cf27..db8890f 100644 --- a/lib/presentation/views/main_menu/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group_view.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart' hide ButtonStyle; import 'package:game_tracker/core/custom_theme.dart'; +import 'package:game_tracker/core/enums.dart'; import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/player.dart'; @@ -266,7 +267,7 @@ class _CreateGroupViewState extends State { CustomWidthButton( text: 'Create group', sizeRelativeToWidth: 0.95, - buttonStyle: ButtonStyle.secondary, + buttonType: ButtonType.primary, onPressed: (_groupNameController.text.isEmpty || selectedPlayers.isEmpty) ? null From e71e65b197f1fa05bb82d977d8012e5a92dd73f2 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 18:27:27 +0100 Subject: [PATCH 77/89] Corrected button color behaviour and added tertiary button --- .../widgets/buttons/custom_width_button.dart | 127 ++++++++++++------ 1 file changed, 83 insertions(+), 44 deletions(-) diff --git a/lib/presentation/widgets/buttons/custom_width_button.dart b/lib/presentation/widgets/buttons/custom_width_button.dart index 2a79d1b..bce78ed 100644 --- a/lib/presentation/widgets/buttons/custom_width_button.dart +++ b/lib/presentation/widgets/buttons/custom_width_button.dart @@ -1,13 +1,12 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; - -enum ButtonStyle { primary, secondary } +import 'package:game_tracker/core/enums.dart'; class CustomWidthButton extends StatelessWidget { const CustomWidthButton({ super.key, required this.text, - this.buttonStyle = ButtonStyle.primary, + this.buttonType = ButtonType.primary, required this.sizeRelativeToWidth, this.onPressed, }); @@ -15,61 +14,101 @@ class CustomWidthButton extends StatelessWidget { final String text; final double sizeRelativeToWidth; final VoidCallback? onPressed; - final ButtonStyle buttonStyle; + final ButtonType buttonType; @override Widget build(BuildContext context) { - final Color buttonBackgroundColor; final Color disabledBackgroundColor; final Color borderSideColor; - final Color disabledBorderSideColor; final Color textcolor; final Color disabledTextColor; - - if(buttonStyle == ButtonStyle.primary){ - buttonBackgroundColor = CustomTheme.primaryColor; - disabledBackgroundColor = CustomTheme.primaryColor.withValues(alpha: 0.24); - borderSideColor = Colors.transparent; - disabledBorderSideColor = Colors.transparent; + if (buttonType == ButtonType.primary) { textcolor = Colors.white; disabledTextColor = Colors.white.withValues(alpha: 0.24); - } else{ + buttonBackgroundColor = CustomTheme.primaryColor; + disabledBackgroundColor = CustomTheme.primaryColor.withValues( + alpha: 0.24, + ); + + return ElevatedButton( + onPressed: onPressed, + style: ElevatedButton.styleFrom( + foregroundColor: textcolor, + disabledForegroundColor: disabledTextColor, + backgroundColor: buttonBackgroundColor, + disabledBackgroundColor: disabledBackgroundColor, + animationDuration: const Duration(), + minimumSize: Size( + MediaQuery.sizeOf(context).width * sizeRelativeToWidth, + 60, + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(12), + ), + ), + child: Text( + text, + style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 22), + ), + ); + } else if (buttonType == ButtonType.secondary) { + textcolor = CustomTheme.primaryColor; + disabledTextColor = CustomTheme.primaryColor.withValues(alpha: 0.5); buttonBackgroundColor = Colors.transparent; disabledBackgroundColor = Colors.transparent; - borderSideColor = CustomTheme.primaryColor.withValues(alpha: 0.6 ); - disabledBorderSideColor = Colors.transparent; + borderSideColor = onPressed != null + ? CustomTheme.primaryColor + : CustomTheme.primaryColor.withValues(alpha: 0.5); + + return OutlinedButton( + onPressed: onPressed, + style: OutlinedButton.styleFrom( + foregroundColor: textcolor, + disabledForegroundColor: disabledTextColor, + backgroundColor: buttonBackgroundColor, + disabledBackgroundColor: disabledBackgroundColor, + animationDuration: const Duration(), + minimumSize: Size( + MediaQuery.sizeOf(context).width * sizeRelativeToWidth, + 60, + ), + side: BorderSide(color: borderSideColor, width: 2), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(12), + ), + ), + child: Text( + text, + style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 22), + ), + ); + } else { textcolor = CustomTheme.primaryColor; - disabledTextColor = CustomTheme.primaryColor.withValues(alpha: 0.24); + disabledTextColor = CustomTheme.primaryColor.withValues(alpha: 0.3); + buttonBackgroundColor = Colors.transparent; + disabledBackgroundColor = Colors.transparent; + + return TextButton( + onPressed: onPressed, + style: TextButton.styleFrom( + foregroundColor: textcolor, + disabledForegroundColor: disabledTextColor, + backgroundColor: buttonBackgroundColor, + disabledBackgroundColor: disabledBackgroundColor, + animationDuration: const Duration(), + minimumSize: Size( + MediaQuery.sizeOf(context).width * sizeRelativeToWidth, + 60, + ), + side: const BorderSide(style: BorderStyle.none), + ), + child: Text( + text, + style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 22), + ), + ); } - - - return ElevatedButton( - onPressed: onPressed, - style: ElevatedButton.styleFrom( - disabledBackgroundColor: disabledBackgroundColor, - minimumSize: Size( - MediaQuery.sizeOf(context).width * sizeRelativeToWidth, - 60, - ), - backgroundColor: buttonBackgroundColor, - side: BorderSide( - color: borderSideColor, - width: 2, - ), - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), - ), - child: Text( - text, - style: TextStyle( - fontWeight: FontWeight.w500, - fontSize: 22, - color: (onPressed == null) - ? disabledTextColor - : textcolor, - ), - ), - ); } } From 248d652e0641cba2a45447a486b97b6b52c5a175 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 18:32:25 +0100 Subject: [PATCH 78/89] Made onPressed not required --- lib/presentation/widgets/tiles/text_icon_list_tile.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/presentation/widgets/tiles/text_icon_list_tile.dart b/lib/presentation/widgets/tiles/text_icon_list_tile.dart index c0fe673..5e272c9 100644 --- a/lib/presentation/widgets/tiles/text_icon_list_tile.dart +++ b/lib/presentation/widgets/tiles/text_icon_list_tile.dart @@ -3,13 +3,13 @@ import 'package:game_tracker/core/custom_theme.dart'; class TextIconListTile extends StatelessWidget { final String text; - final VoidCallback onPressed; + final VoidCallback? onPressed; final bool iconEnabled; const TextIconListTile({ super.key, required this.text, - required this.onPressed, + this.onPressed, this.iconEnabled = true, }); From 8e2befaf3da1a7199d2e388705e60f75fa4c7024 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 19:19:04 +0100 Subject: [PATCH 79/89] Fixed button color problem --- .../widgets/buttons/custom_width_button.dart | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/presentation/widgets/buttons/custom_width_button.dart b/lib/presentation/widgets/buttons/custom_width_button.dart index bce78ed..17c9dc5 100644 --- a/lib/presentation/widgets/buttons/custom_width_button.dart +++ b/lib/presentation/widgets/buttons/custom_width_button.dart @@ -26,11 +26,13 @@ class CustomWidthButton extends StatelessWidget { if (buttonType == ButtonType.primary) { textcolor = Colors.white; - disabledTextColor = Colors.white.withValues(alpha: 0.24); + disabledTextColor = Color.lerp(textcolor, Colors.black, 0.5)!; buttonBackgroundColor = CustomTheme.primaryColor; - disabledBackgroundColor = CustomTheme.primaryColor.withValues( - alpha: 0.24, - ); + disabledBackgroundColor = Color.lerp( + buttonBackgroundColor, + Colors.black, + 0.5, + )!; return ElevatedButton( onPressed: onPressed, @@ -55,12 +57,12 @@ class CustomWidthButton extends StatelessWidget { ); } else if (buttonType == ButtonType.secondary) { textcolor = CustomTheme.primaryColor; - disabledTextColor = CustomTheme.primaryColor.withValues(alpha: 0.5); + disabledTextColor = Color.lerp(textcolor, Colors.black, 0.5)!; buttonBackgroundColor = Colors.transparent; disabledBackgroundColor = Colors.transparent; borderSideColor = onPressed != null ? CustomTheme.primaryColor - : CustomTheme.primaryColor.withValues(alpha: 0.5); + : Color.lerp(CustomTheme.primaryColor, Colors.black, 0.5)!; return OutlinedButton( onPressed: onPressed, @@ -86,7 +88,11 @@ class CustomWidthButton extends StatelessWidget { ); } else { textcolor = CustomTheme.primaryColor; - disabledTextColor = CustomTheme.primaryColor.withValues(alpha: 0.3); + disabledTextColor = Color.lerp( + CustomTheme.primaryColor, + Colors.black, + 0.5, + )!; buttonBackgroundColor = Colors.transparent; disabledBackgroundColor = Colors.transparent; From b684ebd4f66b54ee378ffdf58a365b3fc30953b2 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Wed, 19 Nov 2025 20:25:37 +0100 Subject: [PATCH 80/89] Renamed workflow according to file name --- .gitea/workflows/push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/push.yaml b/.gitea/workflows/push.yaml index c5afb83..700e96b 100644 --- a/.gitea/workflows/push.yaml +++ b/.gitea/workflows/push.yaml @@ -1,4 +1,4 @@ -name: Pull Request Pipeline +name: Push Pipeline on: push: From fa0e9a5dfd7c957e51b370bb9505211b3da51ca0 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Thu, 20 Nov 2025 16:53:14 +0100 Subject: [PATCH 81/89] add trailing button functionality to CustomSearchBar --- .../widgets/custom_search_bar.dart | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/presentation/widgets/custom_search_bar.dart b/lib/presentation/widgets/custom_search_bar.dart index b482efb..61a2154 100644 --- a/lib/presentation/widgets/custom_search_bar.dart +++ b/lib/presentation/widgets/custom_search_bar.dart @@ -6,11 +6,17 @@ class CustomSearchBar extends StatelessWidget { final String hintText; final ValueChanged? onChanged; final BoxConstraints? constraints; + final bool trailingButtonEnabled; + final bool trailingButtonShown; + final VoidCallback? onTrailingButtonPressed; const CustomSearchBar({ super.key, required this.controller, required this.hintText, + this.trailingButtonShown = false, + this.trailingButtonEnabled = true, + this.onTrailingButtonPressed, this.onChanged, this.constraints, }); @@ -25,6 +31,20 @@ class CustomSearchBar extends StatelessWidget { onChanged: onChanged, hintStyle: WidgetStateProperty.all(const TextStyle(fontSize: 16)), leading: const Icon(Icons.search), + trailing: trailingButtonShown + ? [ + GestureDetector( + onTap: onTrailingButtonPressed, + child: Icon( + Icons.add_circle, + color: trailingButtonEnabled + ? null + : Colors.grey.withValues(alpha: 0.2), + ), + ), + SizedBox(width: 5), + ] + : null, backgroundColor: WidgetStateProperty.all(CustomTheme.boxColor), side: WidgetStateProperty.all(BorderSide(color: CustomTheme.boxBorder)), shape: WidgetStateProperty.all( From bce4cdcb2d32caf4a0b3d6398909d08ec2ee4652 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Thu, 20 Nov 2025 16:53:38 +0100 Subject: [PATCH 82/89] Enable player creation via search bar in CreateGroupView --- .../views/main_menu/create_group_view.dart | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/lib/presentation/views/main_menu/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart index db8890f..45f5af8 100644 --- a/lib/presentation/views/main_menu/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group_view.dart @@ -37,6 +37,10 @@ class _CreateGroupViewState extends State { void initState() { super.initState(); db = Provider.of(context, listen: false); + loadPlayerList(); + } + + void loadPlayerList() { _allPlayersFuture = db.playerDao.getAllPlayers(); _allPlayersFuture.then((loadedPlayers) { setState(() { @@ -99,6 +103,41 @@ class _CreateGroupViewState extends State { minHeight: 45, ), hintText: 'Search for players', + trailingButtonShown: true, + trailingButtonEnabled: + _searchBarController.text.isNotEmpty, + onTrailingButtonPressed: () async { + String playerName = _searchBarController.text; + if (playerName.isEmpty) return; + bool success = await db.playerDao.addPlayer( + player: Player(name: playerName), + ); + if (success) { + loadPlayerList(); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + backgroundColor: CustomTheme.boxColor, + content: Center( + child: Text( + 'Successfully added player $playerName.', + style: TextStyle(color: Colors.white), + ), + ), + ), + ); + _searchBarController.clear(); + } else { + SnackBar( + backgroundColor: CustomTheme.boxColor, + content: Center( + child: Text( + 'Could not add player $playerName.', + style: TextStyle(color: Colors.white), + ), + ), + ); + } + }, onChanged: (value) { setState(() { if (value.isEmpty) { From 8ff3c014358af8341caf4a0f17d1e95a09cc1e35 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Thu, 20 Nov 2025 16:59:49 +0100 Subject: [PATCH 83/89] added missing consts & mounted check --- lib/presentation/views/main_menu/create_group_view.dart | 5 +++-- lib/presentation/widgets/custom_search_bar.dart | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart index 45f5af8..3beb62a 100644 --- a/lib/presentation/views/main_menu/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group_view.dart @@ -112,6 +112,7 @@ class _CreateGroupViewState extends State { bool success = await db.playerDao.addPlayer( player: Player(name: playerName), ); + if (!context.mounted) return; if (success) { loadPlayerList(); ScaffoldMessenger.of(context).showSnackBar( @@ -120,7 +121,7 @@ class _CreateGroupViewState extends State { content: Center( child: Text( 'Successfully added player $playerName.', - style: TextStyle(color: Colors.white), + style: const TextStyle(color: Colors.white), ), ), ), @@ -132,7 +133,7 @@ class _CreateGroupViewState extends State { content: Center( child: Text( 'Could not add player $playerName.', - style: TextStyle(color: Colors.white), + style: const TextStyle(color: Colors.white), ), ), ); diff --git a/lib/presentation/widgets/custom_search_bar.dart b/lib/presentation/widgets/custom_search_bar.dart index 61a2154..8a483e5 100644 --- a/lib/presentation/widgets/custom_search_bar.dart +++ b/lib/presentation/widgets/custom_search_bar.dart @@ -42,7 +42,7 @@ class CustomSearchBar extends StatelessWidget { : Colors.grey.withValues(alpha: 0.2), ), ), - SizedBox(width: 5), + const SizedBox(width: 5), ] : null, backgroundColor: WidgetStateProperty.all(CustomTheme.boxColor), From 01117743087c2d74d45d1f514c6682758d166e10 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Thu, 20 Nov 2025 21:26:59 +0100 Subject: [PATCH 84/89] Trim whitespace from group and player names in CreateGroupView --- lib/presentation/views/main_menu/create_group_view.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart index 3beb62a..057a16f 100644 --- a/lib/presentation/views/main_menu/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group_view.dart @@ -107,7 +107,7 @@ class _CreateGroupViewState extends State { trailingButtonEnabled: _searchBarController.text.isNotEmpty, onTrailingButtonPressed: () async { - String playerName = _searchBarController.text; + String playerName = _searchBarController.text.trim(); if (playerName.isEmpty) return; bool success = await db.playerDao.addPlayer( player: Player(name: playerName), @@ -314,7 +314,7 @@ class _CreateGroupViewState extends State { : () async { bool success = await db.groupDao.addGroup( group: Group( - name: _groupNameController.text, + name: _groupNameController.text.trim(), members: selectedPlayers, ), ); From d16beed490dbb6c84a73c80d1da1a2d435e82e9a Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Thu, 20 Nov 2025 21:54:43 +0100 Subject: [PATCH 85/89] felix mach jetzt --- .../views/main_menu/create_group_view.dart | 92 ++++++++++++------- .../widgets/custom_search_bar.dart | 31 ++++--- 2 files changed, 76 insertions(+), 47 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart index 057a16f..590f342 100644 --- a/lib/presentation/views/main_menu/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group_view.dart @@ -37,9 +37,23 @@ class _CreateGroupViewState extends State { void initState() { super.initState(); db = Provider.of(context, listen: false); + _searchBarController.addListener(() { + setState(() {}); + }); + _groupNameController.addListener(() { + setState(() {}); + }); loadPlayerList(); } + @override + void dispose() { + _groupNameController.dispose(); + _searchBarController + .dispose(); // Listener entfernen und Controller aufräumen + super.dispose(); + } + void loadPlayerList() { _allPlayersFuture = db.playerDao.getAllPlayers(); _allPlayersFuture.then((loadedPlayers) { @@ -104,40 +118,16 @@ class _CreateGroupViewState extends State { ), hintText: 'Search for players', trailingButtonShown: true, - trailingButtonEnabled: - _searchBarController.text.isNotEmpty, + trailingButtonEnabled: _searchBarController.text + .trim() + .isNotEmpty, onTrailingButtonPressed: () async { - String playerName = _searchBarController.text.trim(); - if (playerName.isEmpty) return; - bool success = await db.playerDao.addPlayer( - player: Player(name: playerName), + addNewPlayerFromSearch( + context, + _searchBarController, + db, + loadPlayerList, ); - if (!context.mounted) return; - if (success) { - loadPlayerList(); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - backgroundColor: CustomTheme.boxColor, - content: Center( - child: Text( - 'Successfully added player $playerName.', - style: const TextStyle(color: Colors.white), - ), - ), - ), - ); - _searchBarController.clear(); - } else { - SnackBar( - backgroundColor: CustomTheme.boxColor, - content: Center( - child: Text( - 'Could not add player $playerName.', - style: const TextStyle(color: Colors.white), - ), - ), - ); - } }, onChanged: (value) { setState(() { @@ -347,3 +337,41 @@ class _CreateGroupViewState extends State { ); } } + +void addNewPlayerFromSearch( + context, + searchBarController, + db, + loadPlayerList, +) async { + String playerName = searchBarController.text.trim(); + bool success = await db.playerDao.addPlayer(player: Player(name: playerName)); + if (!context.mounted) return; + if (success) { + loadPlayerList(); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + backgroundColor: CustomTheme.boxColor, + content: Center( + child: Text( + 'Successfully added player $playerName.', + style: const TextStyle(color: Colors.white), + ), + ), + ), + ); + searchBarController.clear(); + } else { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + backgroundColor: CustomTheme.boxColor, + content: Center( + child: Text( + 'Could not add player $playerName.', + style: const TextStyle(color: Colors.white), + ), + ), + ), + ); + } +} diff --git a/lib/presentation/widgets/custom_search_bar.dart b/lib/presentation/widgets/custom_search_bar.dart index 8a483e5..4b5fd24 100644 --- a/lib/presentation/widgets/custom_search_bar.dart +++ b/lib/presentation/widgets/custom_search_bar.dart @@ -28,23 +28,24 @@ class CustomSearchBar extends StatelessWidget { constraints: constraints ?? const BoxConstraints(maxHeight: 45, minHeight: 45), hintText: hintText, - onChanged: onChanged, + onChanged: trailingButtonEnabled ? onChanged : null, hintStyle: WidgetStateProperty.all(const TextStyle(fontSize: 16)), leading: const Icon(Icons.search), - trailing: trailingButtonShown - ? [ - GestureDetector( - onTap: onTrailingButtonPressed, - child: Icon( - Icons.add_circle, - color: trailingButtonEnabled - ? null - : Colors.grey.withValues(alpha: 0.2), - ), - ), - const SizedBox(width: 5), - ] - : null, + trailing: [ + Visibility( + visible: trailingButtonShown, + child: GestureDetector( + onTap: onTrailingButtonPressed, + child: Icon( + Icons.add_circle, + color: trailingButtonEnabled + ? null + : Colors.grey.withValues(alpha: 0.2), + ), + ), + ), + const SizedBox(width: 5), + ], backgroundColor: WidgetStateProperty.all(CustomTheme.boxColor), side: WidgetStateProperty.all(BorderSide(color: CustomTheme.boxBorder)), shape: WidgetStateProperty.all( From b67f3212761db7080bd30b388eb3c10835efc891 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Thu, 20 Nov 2025 22:05:44 +0100 Subject: [PATCH 86/89] Added name parameters and function doc --- .../views/main_menu/create_group_view.dart | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart index 590f342..5d53562 100644 --- a/lib/presentation/views/main_menu/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group_view.dart @@ -123,10 +123,10 @@ class _CreateGroupViewState extends State { .isNotEmpty, onTrailingButtonPressed: () async { addNewPlayerFromSearch( - context, - _searchBarController, - db, - loadPlayerList, + context: context, + searchBarController: _searchBarController, + db: db, + loadPlayerList: loadPlayerList, ); }, onChanged: (value) { @@ -338,12 +338,18 @@ class _CreateGroupViewState extends State { } } -void addNewPlayerFromSearch( - context, - searchBarController, - db, - loadPlayerList, -) async { +/// Adds a new player to the database from the search bar input. +/// Shows a snackbar indicating success or failure. +/// [context] - BuildContext to show the snackbar. +/// [searchBarController] - TextEditingController of the search bar. +/// [db] - AppDatabase instance to interact with the database. +/// [loadPlayerList] - Function to reload the player list after adding. +void addNewPlayerFromSearch({ + required BuildContext context, + required TextEditingController searchBarController, + required AppDatabase db, + required Function loadPlayerList, +}) async { String playerName = searchBarController.text.trim(); bool success = await db.playerDao.addPlayer(player: Player(name: playerName)); if (!context.mounted) return; From 01fede29519be32a8ecc166e4e82796ceb110f8f Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Thu, 20 Nov 2025 22:09:08 +0100 Subject: [PATCH 87/89] Added Visibility Widget --- .../views/main_menu/create_group_view.dart | 80 ++++++++++--------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart index 5d53562..de8b2d2 100644 --- a/lib/presentation/views/main_menu/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group_view.dart @@ -246,46 +246,48 @@ class _CreateGroupViewState extends State { layoutBuilder: AnimatedSwitcher.defaultLayoutBuilder, ), - child: - (suggestedPlayers.isEmpty && - allPlayers.isNotEmpty) - ? TopCenteredMessage( - icon: Icons.info, - title: 'Info', - message: - (selectedPlayers.length == - allPlayers.length) - ? 'No more players to add.' - : 'No players found with that name.', - ) - : ListView.builder( - itemCount: suggestedPlayers.length, - itemBuilder: - (BuildContext context, int index) { - return TextIconListTile( - text: suggestedPlayers[index] - .name, - onPressed: () { - setState(() { - if (!selectedPlayers.contains( - suggestedPlayers[index], - )) { - selectedPlayers.add( - suggestedPlayers[index], - ); - selectedPlayers.sort( - (a, b) => a.name - .compareTo(b.name), - ); - suggestedPlayers.remove( - suggestedPlayers[index], - ); - } - }); - }, - ); + child: Visibility( + visible: + (suggestedPlayers.isEmpty && + allPlayers.isNotEmpty), + replacement: ListView.builder( + itemCount: suggestedPlayers.length, + itemBuilder: + (BuildContext context, int index) { + return TextIconListTile( + text: suggestedPlayers[index].name, + onPressed: () { + setState(() { + if (!selectedPlayers.contains( + suggestedPlayers[index], + )) { + selectedPlayers.add( + suggestedPlayers[index], + ); + selectedPlayers.sort( + (a, b) => a.name.compareTo( + b.name, + ), + ); + suggestedPlayers.remove( + suggestedPlayers[index], + ); + } + }); }, - ), + ); + }, + ), + child: TopCenteredMessage( + icon: Icons.info, + title: 'Info', + message: + (selectedPlayers.length == + allPlayers.length) + ? 'No more players to add.' + : 'No players found with that name.', + ), + ), ), ); }, From eb7b247cae739c0d76186b2048b20cf5e60ce4aa Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Thu, 20 Nov 2025 22:11:23 +0100 Subject: [PATCH 88/89] Fixed error adding player with empty name --- lib/presentation/widgets/custom_search_bar.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/widgets/custom_search_bar.dart b/lib/presentation/widgets/custom_search_bar.dart index 4b5fd24..f506605 100644 --- a/lib/presentation/widgets/custom_search_bar.dart +++ b/lib/presentation/widgets/custom_search_bar.dart @@ -35,7 +35,7 @@ class CustomSearchBar extends StatelessWidget { Visibility( visible: trailingButtonShown, child: GestureDetector( - onTap: onTrailingButtonPressed, + onTap: trailingButtonEnabled ? onTrailingButtonPressed : null, child: Icon( Icons.add_circle, color: trailingButtonEnabled From 195ebf569ab24c7a2899295cb00d9fc21d1527b4 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Thu, 20 Nov 2025 22:17:20 +0100 Subject: [PATCH 89/89] Added icon as parameter for custom search bar --- lib/presentation/views/main_menu/create_group_view.dart | 1 + lib/presentation/widgets/custom_search_bar.dart | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/presentation/views/main_menu/create_group_view.dart b/lib/presentation/views/main_menu/create_group_view.dart index de8b2d2..c54369e 100644 --- a/lib/presentation/views/main_menu/create_group_view.dart +++ b/lib/presentation/views/main_menu/create_group_view.dart @@ -118,6 +118,7 @@ class _CreateGroupViewState extends State { ), hintText: 'Search for players', trailingButtonShown: true, + trailingButtonicon: Icons.add_circle, trailingButtonEnabled: _searchBarController.text .trim() .isNotEmpty, diff --git a/lib/presentation/widgets/custom_search_bar.dart b/lib/presentation/widgets/custom_search_bar.dart index f506605..e3fe976 100644 --- a/lib/presentation/widgets/custom_search_bar.dart +++ b/lib/presentation/widgets/custom_search_bar.dart @@ -6,15 +6,17 @@ class CustomSearchBar extends StatelessWidget { final String hintText; final ValueChanged? onChanged; final BoxConstraints? constraints; - final bool trailingButtonEnabled; final bool trailingButtonShown; + final bool trailingButtonEnabled; final VoidCallback? onTrailingButtonPressed; + final IconData trailingButtonicon; const CustomSearchBar({ super.key, required this.controller, required this.hintText, this.trailingButtonShown = false, + this.trailingButtonicon = Icons.clear, this.trailingButtonEnabled = true, this.onTrailingButtonPressed, this.onChanged, @@ -37,7 +39,7 @@ class CustomSearchBar extends StatelessWidget { child: GestureDetector( onTap: trailingButtonEnabled ? onTrailingButtonPressed : null, child: Icon( - Icons.add_circle, + trailingButtonicon, color: trailingButtonEnabled ? null : Colors.grey.withValues(alpha: 0.2),