From 8b1a447bd92e98a88b8aba13aeda291a481eccc7 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Thu, 21 May 2026 00:14:15 +0200 Subject: [PATCH] locs, comments, removed print --- lib/l10n/arb/app_de.arb | 1 + lib/l10n/arb/app_en.arb | 1 + lib/l10n/generated/app_localizations.dart | 6 ++++++ lib/l10n/generated/app_localizations_de.dart | 3 +++ lib/l10n/generated/app_localizations_en.dart | 3 +++ .../create_match/create_match_view.dart | 2 +- .../create_teams/create_teams_view.dart | 17 ++++++++++++----- .../create_teams/edit_members_view.dart | 1 - .../views/main_menu/match_view/match_view.dart | 1 - 9 files changed, 27 insertions(+), 8 deletions(-) diff --git a/lib/l10n/arb/app_de.arb b/lib/l10n/arb/app_de.arb index 679fcc1..5b37a5e 100644 --- a/lib/l10n/arb/app_de.arb +++ b/lib/l10n/arb/app_de.arb @@ -137,6 +137,7 @@ "stats": "Statistiken", "successfully_added_player": "Spieler:in {playerName} erfolgreich hinzugefügt", "team": "Team", + "team_match": "Teamspiel", "teams": "Teams", "there_are_no_games_matching_your_search": "Es gibt keine Spielvorlagen, die deiner Suche entspricht", "there_is_no_group_matching_your_search": "Es gibt keine Gruppe, die deiner Suche entspricht", diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb index b41a6f7..e2830e9 100644 --- a/lib/l10n/arb/app_en.arb +++ b/lib/l10n/arb/app_en.arb @@ -146,6 +146,7 @@ } }, "team": "Team", + "team_match": "Team Match", "teams": "Teams", "there_are_no_games_matching_your_search": "There are no games matching your search", "there_is_no_group_matching_your_search": "There is no group matching your search", diff --git a/lib/l10n/generated/app_localizations.dart b/lib/l10n/generated/app_localizations.dart index 4ce2c74..e51aa32 100644 --- a/lib/l10n/generated/app_localizations.dart +++ b/lib/l10n/generated/app_localizations.dart @@ -872,6 +872,12 @@ abstract class AppLocalizations { /// **'Team'** String get team; + /// No description provided for @team_match. + /// + /// In en, this message translates to: + /// **'Team Match'** + String get team_match; + /// No description provided for @teams. /// /// In en, this message translates to: diff --git a/lib/l10n/generated/app_localizations_de.dart b/lib/l10n/generated/app_localizations_de.dart index c634f55..ccdc989 100644 --- a/lib/l10n/generated/app_localizations_de.dart +++ b/lib/l10n/generated/app_localizations_de.dart @@ -419,6 +419,9 @@ class AppLocalizationsDe extends AppLocalizations { @override String get team => 'Team'; + @override + String get team_match => 'Teamspiel'; + @override String get teams => 'Teams'; diff --git a/lib/l10n/generated/app_localizations_en.dart b/lib/l10n/generated/app_localizations_en.dart index 8e79c77..feb085a 100644 --- a/lib/l10n/generated/app_localizations_en.dart +++ b/lib/l10n/generated/app_localizations_en.dart @@ -419,6 +419,9 @@ class AppLocalizationsEn extends AppLocalizations { @override String get team => 'Team'; + @override + String get team_match => 'Team Match'; + @override String get teams => 'Teams'; diff --git a/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart b/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart index 65586a9..fd14508 100644 --- a/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart +++ b/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart @@ -151,7 +151,7 @@ class _CreateMatchViewState extends State { if (!isEditMode()) ChooseTile( - title: 'Team Match', + title: loc.team_match, trailing: Switch.adaptive( activeTrackColor: CustomTheme.primaryColor, padding: const EdgeInsets.symmetric(vertical: -15), diff --git a/lib/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart b/lib/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart index 295cccd..afee2fc 100644 --- a/lib/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart +++ b/lib/presentation/views/main_menu/match_view/create_match/create_teams/create_teams_view.dart @@ -27,11 +27,11 @@ class CreateTeamsView extends StatefulWidget { class _CreateTeamsViewState extends State { final Random random = Random(); + List get matchPlayers => widget.match.players; + late List teams; late List nameController; - final int initialTeamCount = 2; - List get matchPlayers => widget.match.players; @override void didChangeDependencies() { @@ -101,9 +101,9 @@ class _CreateTeamsViewState extends State { ); }); }, - onDelete: teams.length >= 3 - ? () => _removeTeam(index) - : null, + onDelete: teams.length <= 2 + ? null + : () => _removeTeam(index), onColorSelection: (color) { setState(() { teams[index] = teams[index].copyWith(color: color); @@ -113,9 +113,12 @@ class _CreateTeamsViewState extends State { }, ), ), + + // Button row Row( mainAxisAlignment: MainAxisAlignment.center, children: [ + // Redistribute MainMenuButton( icon: Icons.cached, text: loc.redistribute, @@ -124,6 +127,8 @@ class _CreateTeamsViewState extends State { }), ), const SizedBox(width: 15), + + // Add new team MainMenuButton( icon: Icons.add, onPressed: teams.length >= widget.match.players.length @@ -131,6 +136,8 @@ class _CreateTeamsViewState extends State { : addTeam, ), const SizedBox(width: 15), + + // Confirm teams and start match MainMenuButton( icon: Icons.check, onPressed: teams.every((team) => team.members.isNotEmpty) diff --git a/lib/presentation/views/main_menu/match_view/create_match/create_teams/edit_members_view.dart b/lib/presentation/views/main_menu/match_view/create_match/create_teams/edit_members_view.dart index 12071be..78eecef 100644 --- a/lib/presentation/views/main_menu/match_view/create_match/create_teams/edit_members_view.dart +++ b/lib/presentation/views/main_menu/match_view/create_match/create_teams/edit_members_view.dart @@ -21,7 +21,6 @@ class EditMembersView extends StatefulWidget { class _EditMembersViewState extends State { List selectedPlayers = []; - List matchPlayer = []; @override void initState() { diff --git a/lib/presentation/views/main_menu/match_view/match_view.dart b/lib/presentation/views/main_menu/match_view/match_view.dart index 69b7df7..a7f60c6 100644 --- a/lib/presentation/views/main_menu/match_view/match_view.dart +++ b/lib/presentation/views/main_menu/match_view/match_view.dart @@ -142,7 +142,6 @@ class _MatchViewState extends State { /// Loads the matches from the database and sorts them by creation date. void loadMatches() { - print('Loading matches from database'); isLoading = true; Future.wait([ db.matchDao.getAllMatches(),