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

Merge remote-tracking branch 'origin/development' into feature/88-neue-datenbank-struktur

Browse Source 
# Conflicts:
#	lib/data/dao/group_match_dao.dart
#	lib/data/dao/match_dao.dart
#	lib/data/dao/player_match_dao.dart
#	lib/data/db/database.dart
#	lib/data/db/database.g.dart
#	lib/data/db/tables/group_match_table.dart
#	lib/data/db/tables/player_match_table.dart
#	lib/data/dto/match.dart
#	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
#	lib/services/data_transfer_service.dart
#	test/db_tests/game_test.dart
#	test/db_tests/group_match_test.dart
#	test/db_tests/player_match_test.dart
This commit is contained in:
gelbeinhalb
2026-02-01 15:55:06 +01:00
parent 1d352821fc 9c00b48de5
commit acf3a7b003
112 changed files with 1292 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/core/custom_theme.dart
View File

@@ -7,25 +7,25 @@ class CustomTheme {
// ==================== Colors ====================
/// Primary color of the app theme
static Color primaryColor = const Color(0xFF7505E4);
static const Color primaryColor = Color(0xFFef681f);
/// Secondary color of the app theme
static Color secondaryColor = const Color(0xFFAFA2FF);
static const Color secondaryColor = Color(0xFFf2a981);
/// Background color of the app theme
static Color backgroundColor = const Color(0xFF0B0B0B);
static const backgroundColor = Color(0xFF0B0B0B);
/// Default color for boxes and containers
static Color boxColor = const Color(0xFF101010);
static const Color boxColor = Color(0xFF101010);
/// Default border color for boxes and containers
static Color boxBorder = const Color(0xFF272727);
static const Color boxBorder = Color(0xFF272727);
/// Color for boxes and containers displayed on boxes
static Color onBoxColor = const Color(0xFF181818);
static const Color onBoxColor = Color(0xFF181818);
/// Text color used throughout the app
static const Color textColor = Colors.white;
static const Color textColor = Color(0xFFFFFFFF);
/// Selected color for the [NavbarItem]
static Color navBarItemSelectedColor = primaryColor.withGreen(100);
@@ -63,18 +63,18 @@ class CustomTheme {
);
// ==================== App Bar Theme ====================
static AppBarTheme appBarTheme = AppBarTheme(
static const AppBarTheme appBarTheme = AppBarTheme(
backgroundColor: backgroundColor,
foregroundColor: textColor,
elevation: 0,
scrolledUnderElevation: 0,
centerTitle: true,
titleTextStyle: const TextStyle(
titleTextStyle: TextStyle(
color: textColor,
fontSize: 20,
fontWeight: FontWeight.bold,
overflow: TextOverflow.ellipsis,
),
iconTheme: const IconThemeData(color: textColor),
iconTheme: IconThemeData(color: textColor),
);
}

2
lib/core/enums.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:game_tracker/l10n/generated/app_localizations.dart';
import 'package:tallee/l10n/generated/app_localizations.dart';
/// Button types used for styling the [CustomWidthButton]
/// - [ButtonType.primary]: Primary button style.