Renamed GameColor to AppColor

This commit is contained in:
2026-05-21 18:31:15 +02:00
parent 021a546479
commit df8e060707
19 changed files with 80 additions and 78 deletions

View File

@@ -92,7 +92,7 @@ class GameDao extends DatabaseAccessor<AppDatabase> with _$GameDaoMixin {
name: row.name,
ruleset: Ruleset.values.firstWhere((e) => e.name == row.ruleset),
description: row.description,
color: GameColor.values.firstWhere((e) => e.name == row.color),
color: AppColor.values.firstWhere((e) => e.name == row.color),
icon: row.icon,
createdAt: row.createdAt,
),
@@ -109,7 +109,7 @@ class GameDao extends DatabaseAccessor<AppDatabase> with _$GameDaoMixin {
name: result.name,
ruleset: Ruleset.values.firstWhere((e) => e.name == result.ruleset),
description: result.description,
color: GameColor.values.firstWhere((e) => e.name == result.color),
color: AppColor.values.firstWhere((e) => e.name == result.color),
icon: result.icon,
createdAt: result.createdAt,
);
@@ -156,7 +156,7 @@ class GameDao extends DatabaseAccessor<AppDatabase> with _$GameDaoMixin {
/// Updates the color of the game with the given [gameId].
Future<bool> updateGameColor({
required String gameId,
required GameColor color,
required AppColor color,
}) async {
final rowsAffected =
await (update(gameTable)..where((g) => g.id.equals(gameId))).write(

View File

@@ -116,7 +116,7 @@ class TeamDao extends DatabaseAccessor<AppDatabase> with _$TeamDaoMixin {
id: row.id,
name: row.name,
createdAt: row.createdAt,
color: GameColor.values.byName(row.color),
color: AppColor.values.byName(row.color),
score: row.score,
members: members,
);
@@ -151,7 +151,7 @@ class TeamDao extends DatabaseAccessor<AppDatabase> with _$TeamDaoMixin {
id: result.id,
name: result.name,
createdAt: result.createdAt,
color: GameColor.values.byName(result.color),
color: AppColor.values.byName(result.color),
score: result.score,
members: members,
);
@@ -193,7 +193,7 @@ class TeamDao extends DatabaseAccessor<AppDatabase> with _$TeamDaoMixin {
/// Updates the color of the team with the given [teamId].
Future<bool> updateTeamColor({
required String teamId,
required GameColor color,
required AppColor color,
}) async {
final rowsAffected =
await (update(teamTable)..where((t) => t.id.equals(teamId))).write(

View File

@@ -8,13 +8,13 @@ class Game {
final String name;
final Ruleset ruleset;
final String description;
final GameColor color;
final AppColor color;
final String icon;
Game({
required this.name,
required this.ruleset,
this.color = GameColor.orange,
this.color = AppColor.orange,
this.description = '',
this.icon = '',
String? id,
@@ -33,7 +33,7 @@ class Game {
String? name,
Ruleset? ruleset,
String? description,
GameColor? color,
AppColor? color,
String? icon,
}) {
return Game(
@@ -73,7 +73,7 @@ class Game {
orElse: () => Ruleset.singleWinner,
),
description = json['description'],
color = GameColor.values.firstWhere((e) => e.name == json['color']),
color = AppColor.values.firstWhere((e) => e.name == json['color']),
icon = json['icon'];
Map<String, dynamic> toJson() => {

View File

@@ -113,7 +113,7 @@ class Match {
name: '',
ruleset: Ruleset.singleWinner,
description: '',
color: GameColor.blue,
color: AppColor.blue,
icon: '',
),
group = null,

View File

@@ -8,7 +8,7 @@ class Team {
final String id;
final String name;
final DateTime createdAt;
final GameColor color;
final AppColor color;
final int? score;
final List<Player> members;
@@ -16,7 +16,7 @@ class Team {
String? id,
required this.name,
DateTime? createdAt,
this.color = GameColor.blue,
this.color = AppColor.blue,
this.score,
required this.members,
}) : id = id ?? const Uuid().v4(),
@@ -31,7 +31,7 @@ class Team {
String? id,
String? name,
DateTime? createdAt,
GameColor? color,
AppColor? color,
int? score,
List<Player>? members,
}) {
@@ -71,7 +71,7 @@ class Team {
: id = json['id'],
name = json['name'],
createdAt = DateTime.parse(json['createdAt']),
color = GameColor.values.byName(json['color'] ?? GameColor.blue.name),
color = AppColor.values.byName(json['color'] ?? AppColor.blue.name),
score = json['score'] ?? 0,
members = []; // Populated during import via DataTransferService