liquid-development/game-tracker
3
0
Fork 0
Code Issues 14 Pull Requests 6 Actions Releases 1 Activity

Merge remote-tracking branch 'origin/development' into feature/100-lokalisierung-hinzufügen
All checks were successful
Pull Request Pipeline / test (pull_request) Successful in 2m15s
Details
Pull Request Pipeline / lint (pull_request) Successful in 2m15s
Details

Browse Source 
# Conflicts:
#	lib/presentation/views/main_menu/home_view.dart
#	lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
#	lib/presentation/views/main_menu/match_view/match_view.dart
This commit is contained in:
Mathis Kirchner
2026-01-02 18:49:34 +01:00
parent 4451f9e2a9 f84a645e61
commit 7f923f6dff
5 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/presentation/views/main_menu/home_view.dart
View File

@@ -7,8 +7,8 @@ import 'package:game_tracker/data/dto/player.dart';
import 'package:game_tracker/l10n/generated/app_localizations.dart';
import 'package:game_tracker/presentation/widgets/app_skeleton.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/match_summary_tile.dart';
import 'package:game_tracker/presentation/widgets/tiles/quick_info_tile.dart';
import 'package:provider/provider.dart';
@@ -123,7 +123,7 @@ class _HomeViewState extends State<HomeView> {
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
MatchTile(
MatchSummaryTile(
matchTitle: recentMatches[0].name,
game: AppLocalizations.of(context)!.winner_label,
ruleset: AppLocalizations.of(
@@ -141,7 +141,7 @@ class _HomeViewState extends State<HomeView> {
child: Divider(),
),
if (loadedRecentMatches.length > 1) ...[
MatchTile(
MatchSummaryTile(
matchTitle: recentMatches[1].name,
game: AppLocalizations.of(
context,
@@ -173,7 +173,6 @@ class _HomeViewState extends State<HomeView> {
),
),
),
// TODO: Implement quick create functionality
InfoTile(
width: constraints.maxWidth * 0.95,
title: AppLocalizations.of(context)!.quick_create,

18
lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
View File

@@ -32,6 +32,9 @@ class _CreateMatchViewState extends State<CreateMatchView> {
/// Controller for the match name input field
final TextEditingController _matchNameController = TextEditingController();
/// Hint text for the match name input field
String hintText = 'Match Name';
/// List of all groups from the database
List<Group> groupsList = [];
@@ -132,7 +135,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 5),
child: TextInputField(
controller: _matchNameController,
hintText: AppLocalizations.of(context)!.match_name,
hintText: hintText,
),
),
ChooseTile(
@@ -151,11 +154,13 @@ class _CreateMatchViewState extends State<CreateMatchView> {
);
setState(() {
if (selectedGameIndex != -1) {
hintText = games[selectedGameIndex].$1;
selectedRuleset = games[selectedGameIndex].$3;
selectedRulesetIndex = _getRulesets(
context,
).indexWhere((r) => r.$1 == selectedRuleset);
} else {
hintText = 'Match Name';
selectedRuleset = null;
}
});
@@ -230,7 +235,9 @@ class _CreateMatchViewState extends State<CreateMatchView> {
onPressed: _enableCreateGameButton()
? () async {
Match match = Match(
name: _matchNameController.text.trim(),
name: _matchNameController.text.isEmpty
? hintText
: _matchNameController.text.trim(),
createdAt: DateTime.now(),
group: selectedGroup,
players: selectedPlayers,
@@ -260,9 +267,8 @@ class _CreateMatchViewState extends State<CreateMatchView> {
/// Determines whether the "Create Game" button should be enabled based on
/// the current state of the input fields.
bool _enableCreateGameButton() {
return _matchNameController.text.isNotEmpty &&
(selectedGroup != null ||
(selectedPlayers != null && selectedPlayers!.length > 1)) &&
selectedRuleset != null;
return selectedGroup != null ||
(selectedPlayers != null && selectedPlayers!.length > 1) &&
selectedRuleset != null;
}
}

8
lib/presentation/views/main_menu/match_view/match_view.dart
View File

@@ -13,7 +13,7 @@ import 'package:game_tracker/presentation/views/main_menu/match_view/create_matc
import 'package:game_tracker/presentation/views/main_menu/match_view/match_result_view.dart';
import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
import 'package:game_tracker/presentation/widgets/tiles/game_history_tile.dart';
import 'package:game_tracker/presentation/widgets/tiles/match_tile.dart';
import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
import 'package:provider/provider.dart';
@@ -31,9 +31,9 @@ class _MatchViewState extends State<MatchView> {
List<Match> matches = List.filled(
4,
Match(
name: 'Skeleton Gamename',
name: 'Skeleton match name',
group: Group(
name: 'Groupname',
name: 'Group name',
members: List.filled(5, Player(name: 'Player')),
),
winner: Player(name: 'Player'),
@@ -75,7 +75,7 @@ class _MatchViewState extends State<MatchView> {
height: MediaQuery.paddingOf(context).bottom - 20,
);
}
return GameHistoryTile(
return MatchTile(
onTap: () async {
Navigator.push(
context,