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

Compare commits

base: liquid-development:e4de8fdb253906e14723e955ec01aa9fd7df358c
Branches Tags
liquid-development:development liquid-development:feature/151-einstellungen-ausgestalten liquid-development:setup/update-issue-and-pr-templates liquid-development:feature/129-neues-popup-design liquid-development:enhancement/138-neues-navbar-design liquid-development:feature/118-bearbeiten-und-löschen-von-gruppen liquid-development:main liquid-development:enhancement/81-readme-vervollstaendigen
liquid-development:v.0.0.1-alpha
..
compare: liquid-development:35f2f8754ae7d2b4f6644e8cf0e34035fd8663e1
Branches Tags
liquid-development:feature/151-einstellungen-ausgestalten liquid-development:setup/update-issue-and-pr-templates liquid-development:feature/129-neues-popup-design liquid-development:enhancement/138-neues-navbar-design liquid-development:feature/118-bearbeiten-und-löschen-von-gruppen liquid-development:development liquid-development:main liquid-development:enhancement/81-readme-vervollstaendigen
liquid-development:v.0.0.1-alpha

7 Commits
e4de8fdb25 ... 35f2f8754a

Author SHA1 Message Date
mathiskirchner
35f2f8754a added functionality to create group 2025-11-17 18:24:30 +01:00
mathiskirchner
47bb090e72 added option to choose disabledBackgroundColor in FullWidthButton 2025-11-17 18:23:07 +01:00
mathiskirchner
b2a3d7ce7f Merge remote-tracking branch 'origin/development' into feature/5-creategroupview-erstellen 2025-11-17 15:38:33 +01:00
Felix Kirchner
fde5344244 Merge pull request 'Skeleton für HomeView implementieren' (#27) from enhancement/26-skeleton-fuer-homeview-implementieren into development 
Reviewed-on: #27
Reviewed-by: mathiskir <mathis.kirchner.mk@gmail.com>
 2025-11-17 12:58:28 +00:00
Felix Kirchner
2fc7eab1ac Corrected game tile skeleton 2025-11-17 13:19:05 +01:00
Felix Kirchner
c195c5e2bb Merge branch 'development' into enhancement/26-skeleton-fuer-homeview-implementieren 2025-11-16 22:07:34 +01:00
Felix Kirchner
a9dd3216cc Implemented skeleton 2025-11-16 20:51:28 +01:00
4 changed files with 315 additions and 173 deletions
Expand all files Collapse all files

197
lib/presentation/views/main_menu/create_group/create_group_view.dart
View File

@@ -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<CreateGroupView> {
List<Player> 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<Player> selectedPlayers = [];
List<Player> suggestedPlayers = [];
List<Player> allPlayers = [];
late final AppDatabase db;
late Future<List<Player>> _allPlayersFuture;
late final List<Player> 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<AppDatabase>(context, listen: false);
db = Provider.of<AppDatabase>(context, listen: false);
_allPlayersFuture = db.playerDao.getAllPlayers();
_allPlayersFuture.then((loadedPlayers) {
setState(() {
allPlayers = loadedPlayers;
suggestedPlayers = loadedPlayers;
});
});
}
@override
@@ -55,6 +62,10 @@ class _CreateGroupViewState extends State<CreateGroupView> {
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<CreateGroupView> {
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<CreateGroupView> {
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<CreateGroupView> {
spacing: 8.0,
runSpacing: 8.0,
children: <Widget>[
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<CreateGroupView> {
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<CreateGroupView> {
child: const Icon(Icons.close, size: 20),
onTap: () {
setState(() {
selectedPlayers.remove(player);
selectedPlayers.remove(selectedPlayer);
});
},
),
@@ -183,7 +208,10 @@ class _CreateGroupViewState extends State<CreateGroupView> {
}
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<CreateGroupView> {
final bool isLoading =
snapshot.connectionState ==
ConnectionState.waiting;
final List<Player> players = isLoading
? skeletonData
: (snapshot.data ?? []);
return Expanded(
child: Skeletonizer(
effect: PulseEffect(
@@ -217,48 +242,69 @@ class _CreateGroupViewState extends State<CreateGroupView> {
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<CreateGroupView> {
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<Player> 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<CreateGroupView> {
Future<void> addSamplePlayers(BuildContext context) async {
final db = Provider.of<AppDatabase>(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++) {

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

@@ -5,6 +5,7 @@ import 'package:game_tracker/presentation/widgets/quick_create_button.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';
import 'package:skeletonizer/skeletonizer.dart';
class HomeView extends StatefulWidget {
const HomeView({super.key});
@@ -16,6 +17,7 @@ class HomeView extends StatefulWidget {
class _HomeViewState extends State<HomeView> {
late Future<int> _gameCountFuture;
late Future<int> _groupCountFuture;
bool isLoading = true;
@override
initState() {
@@ -23,120 +25,165 @@ class _HomeViewState extends State<HomeView> {
final db = Provider.of<AppDatabase>(context, listen: false);
_gameCountFuture = db.gameDao.getGameCount();
_groupCountFuture = db.groupDao.getGroupCount();
Future.wait([_gameCountFuture, _groupCountFuture]).then((_) async {
await Future.delayed(const Duration(milliseconds: 50));
if (mounted) {
setState(() {
isLoading = false;
});
}
});
}
@override
Widget build(BuildContext context) {
return LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) {
return SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
FutureBuilder<int>(
future: _gameCountFuture,
builder: (context, snapshot) {
final int count = (snapshot.hasData) ? snapshot.data! : 0;
return QuickInfoTile(
width: constraints.maxWidth * 0.45,
height: constraints.maxHeight * 0.15,
title: 'Games',
icon: Icons.groups_rounded,
value: count,
);
},
),
SizedBox(width: constraints.maxWidth * 0.05),
FutureBuilder<int>(
future: _groupCountFuture,
builder: (context, snapshot) {
final int count =
(snapshot.connectionState == ConnectionState.done &&
snapshot.hasData)
? snapshot.data!
: 0;
return QuickInfoTile(
width: constraints.maxWidth * 0.45,
height: constraints.maxHeight * 0.15,
title: 'Groups',
icon: Icons.groups_rounded,
value: count,
);
},
),
],
),
Padding(
padding: const EdgeInsets.symmetric(vertical: 16.0),
child: InfoTile(
width: constraints.maxWidth * 0.95,
title: 'Recent Games',
icon: Icons.timer,
content: const Padding(
padding: EdgeInsets.symmetric(horizontal: 40.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GameTile(
gameTitle: 'Gamenight',
gameType: 'Cabo',
ruleset: 'Lowest Points',
players: '5 Players',
winner: 'Leonard',
),
Padding(
padding: EdgeInsets.symmetric(vertical: 8.0),
child: Divider(),
),
GameTile(
gameTitle: 'Schoolbreak',
gameType: 'Uno',
ruleset: 'Highest Points',
players: 'The Gang',
winner: 'Lina',
),
SizedBox(height: 8),
],
),
),
),
),
InfoTile(
width: constraints.maxWidth * 0.95,
title: 'Quick Create',
icon: Icons.add_box_rounded,
content: Column(
spacing: 8,
return 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: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
QuickCreateButton(text: 'Category 1', onPressed: () {}),
QuickCreateButton(text: 'Category 2', onPressed: () {}),
],
FutureBuilder<int>(
future: _gameCountFuture,
builder: (context, snapshot) {
final int count = (snapshot.hasData)
? snapshot.data!
: 0;
return QuickInfoTile(
width: constraints.maxWidth * 0.45,
height: constraints.maxHeight * 0.15,
title: 'Games',
icon: Icons.groups_rounded,
value: count,
);
},
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
QuickCreateButton(text: 'Category 3', onPressed: () {}),
QuickCreateButton(text: 'Category 4', onPressed: () {}),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
QuickCreateButton(text: 'Category 5', onPressed: () {}),
QuickCreateButton(text: 'Category 6', onPressed: () {}),
],
SizedBox(width: constraints.maxWidth * 0.05),
FutureBuilder<int>(
future: _groupCountFuture,
builder: (context, snapshot) {
final int count =
(snapshot.connectionState == ConnectionState.done &&
snapshot.hasData)
? snapshot.data!
: 0;
return QuickInfoTile(
width: constraints.maxWidth * 0.45,
height: constraints.maxHeight * 0.15,
title: 'Groups',
icon: Icons.groups_rounded,
value: count,
);
},
),
],
),
),
],
Padding(
padding: const EdgeInsets.symmetric(vertical: 16.0),
child: InfoTile(
width: constraints.maxWidth * 0.95,
title: 'Recent Games',
icon: Icons.timer,
content: const Padding(
padding: EdgeInsets.symmetric(horizontal: 40.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GameTile(
gameTitle: 'Gamenight',
gameType: 'Cabo',
ruleset: 'Lowest Points',
players: '5 Players',
winner: 'Leonard',
),
Padding(
padding: EdgeInsets.symmetric(vertical: 8.0),
child: Divider(),
),
GameTile(
gameTitle: 'Schoolbreak',
gameType: 'Uno',
ruleset: 'Highest Points',
players: 'The Gang',
winner: 'Lina',
),
SizedBox(height: 8),
],
),
),
),
),
InfoTile(
width: constraints.maxWidth * 0.95,
title: 'Quick Create',
icon: Icons.add_box_rounded,
content: Column(
spacing: 8,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
QuickCreateButton(
text: 'Category 1',
onPressed: () {},
),
QuickCreateButton(
text: 'Category 2',
onPressed: () {},
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
QuickCreateButton(
text: 'Category 3',
onPressed: () {},
),
QuickCreateButton(
text: 'Category 4',
onPressed: () {},
),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
QuickCreateButton(
text: 'Category 5',
onPressed: () {},
),
QuickCreateButton(
text: 'Category 6',
onPressed: () {},
),
],
),
],
),
),
],
),
),
);
},

3
lib/presentation/widgets/full_width_button.dart
View File

@@ -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,

35
lib/presentation/widgets/game_tile.dart
View File

@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:game_tracker/core/custom_theme.dart';
import 'package:skeletonizer/skeletonizer.dart';
class GameTile extends StatefulWidget {
final String gameTitle;
@@ -48,9 +49,11 @@ class _GameTileState extends State<GameTile> {
borderRadius: BorderRadius.circular(4),
color: CustomTheme.primaryColor,
),
child: Text(
widget.ruleset,
style: const TextStyle(fontWeight: FontWeight.bold),
child: Skeleton.ignore(
child: Text(
widget.ruleset,
style: const TextStyle(fontWeight: FontWeight.bold),
),
),
),
Center(
@@ -68,19 +71,21 @@ class _GameTileState extends State<GameTile> {
borderRadius: BorderRadius.circular(4),
color: Colors.yellow.shade300,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.emoji_events, color: Colors.black, size: 20),
Text(
widget.winner,
textAlign: TextAlign.center,
style: const TextStyle(
fontWeight: FontWeight.bold,
color: Colors.black87,
child: Skeleton.ignore(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.emoji_events, color: Colors.black, size: 20),
Text(
widget.winner,
textAlign: TextAlign.center,
style: const TextStyle(
fontWeight: FontWeight.bold,
color: Colors.black87,
),
),
),
],
],
),
),
),
),