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

MVP #141

Merged
flixcoo merged 705 commits from development into main 2026-01-09 12:55:50 +00:00
Conversation 2 Commits 705 Files Changed 133 +170 -153
2 changed files with 170 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2838376434 - Show all commits

305
lib/presentation/views/main_menu/create_game/create_game_view.dart
View File

@@ -4,10 +4,11 @@ import 'package:game_tracker/core/enums.dart';
import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/db/database.dart';
import 'package:game_tracker/data/dto/game.dart'; import 'package:game_tracker/data/dto/game.dart';
import 'package:game_tracker/data/dto/group.dart'; import 'package:game_tracker/data/dto/group.dart';
import 'package:game_tracker/data/dto/player.dart';
import 'package:game_tracker/presentation/views/main_menu/create_game/choose_group_view.dart'; import 'package:game_tracker/presentation/views/main_menu/create_game/choose_group_view.dart';
import 'package:game_tracker/presentation/views/main_menu/create_game/choose_ruleset_view.dart'; import 'package:game_tracker/presentation/views/main_menu/create_game/choose_ruleset_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/buttons/custom_width_button.dart';
import 'package:game_tracker/presentation/widgets/player_selection.dart';
import 'package:game_tracker/presentation/widgets/text_input/text_input_field.dart'; import 'package:game_tracker/presentation/widgets/text_input/text_input_field.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@@ -19,12 +20,23 @@ class CreateGameView extends StatefulWidget {
} }
class _CreateGameViewState extends State<CreateGameView> { class _CreateGameViewState extends State<CreateGameView> {
/// Reference to the app database
late final AppDatabase db; late final AppDatabase db;
/// Futures to load all groups and players from the database
late Future<List<Group>> _allGroupsFuture; late Future<List<Group>> _allGroupsFuture;
/// Future to load all players from the database
late Future<List<Player>> _allPlayersFuture;
/// Controller for the game name input field
final TextEditingController _gameNameController = TextEditingController(); final TextEditingController _gameNameController = TextEditingController();
/// List of all groups from the database /// List of all groups from the database
late final List<Group> groupsList; List<Group> groupsList = [];
/// List of all players from the database
List<Player> playerList = [];
/// The currently selected group /// The currently selected group
Group? selectedGroup; Group? selectedGroup;
@@ -40,8 +52,6 @@ class _CreateGameViewState extends State<CreateGameView> {
/// the [ChooseRulesetView] /// the [ChooseRulesetView]
int selectedRulesetIndex = -1; int selectedRulesetIndex = -1;
bool isLoading = true;
/// List of available rulesets with their display names and descriptions /// List of available rulesets with their display names and descriptions
/// as tuples of (Ruleset, String, String) /// as tuples of (Ruleset, String, String)
List<(Ruleset, String, String)> rulesets = [ List<(Ruleset, String, String)> rulesets = [
@@ -73,16 +83,11 @@ class _CreateGameViewState extends State<CreateGameView> {
db = Provider.of<AppDatabase>(context, listen: false); db = Provider.of<AppDatabase>(context, listen: false);
_allGroupsFuture = db.groupDao.getAllGroups(); _allGroupsFuture = db.groupDao.getAllGroups();
_allPlayersFuture = db.playerDao.getAllPlayers();
Future.wait([_allGroupsFuture]).then((result) async { Future.wait([_allGroupsFuture, _allPlayersFuture]).then((result) async {
await Future.delayed(const Duration(milliseconds: 250)); groupsList = result[0] as List<Group>;
groupsList = result[0]; playerList = result[1] as List<Player>;
if (mounted) {
setState(() {
isLoading = false;
});
}
}); });
} }
@@ -100,147 +105,149 @@ class _CreateGameViewState extends State<CreateGameView> {
centerTitle: true, centerTitle: true,
), ),
body: SafeArea( body: SafeArea(
child: AppSkeleton( child: Column(
enabled: isLoading, mainAxisAlignment: MainAxisAlignment.start,
child: Column( children: [
mainAxisAlignment: MainAxisAlignment.start, Container(
children: [ margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
Container( child: TextInputField(
margin: const EdgeInsets.symmetric( controller: _gameNameController,
horizontal: 12, hintText: 'Game name',
onChanged: (value) {
setState(() {});
},
),
),
GestureDetector(
onTap: () async {
selectedRuleset = await Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => ChooseRulesetView(
rulesets: rulesets,
initialRulesetIndex: selectedRulesetIndex,
),
),
);
selectedRulesetIndex = rulesets.indexWhere(
(r) => r.$1 == selectedRuleset,
);
setState(() {});
},
child: Container(
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 5),
padding: const EdgeInsets.symmetric(
vertical: 10, vertical: 10,
horizontal: 15,
), ),
child: TextInputField(
controller: _gameNameController,
hintText: 'Game name',
onChanged: (value) {
setState(() {});
},
),
),
GestureDetector(
onTap: () async {
selectedRuleset = await Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => ChooseRulesetView(
rulesets: rulesets,
initialRulesetIndex: selectedRulesetIndex,
),
),
);
selectedRulesetIndex = rulesets.indexWhere(
(r) => r.$1 == selectedRuleset,
);
setState(() {});
},
child: Container(
margin: const EdgeInsets.symmetric(
horizontal: 12,
vertical: 5,
),
padding: const EdgeInsets.symmetric(
vertical: 10,
horizontal: 15,
),
decoration: CustomTheme.standardBoxDecoration,
child: Row(
children: [
const Text(
'Ruleset',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
),
),
const Spacer(),
Text(
selectedRuleset == null
? 'None'
: translateRulesetToString(selectedRuleset!),
),
const SizedBox(width: 10),
const Icon(Icons.arrow_forward_ios, size: 16),
],
),
),
),
GestureDetector(
onTap: () async {
selectedGroup = await Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => ChooseGroupView(
groups: groupsList,
initialGroupIndex: selectedGroupIndex,
),
),
);
selectedGroupIndex = groupsList.indexWhere(
(g) => g.id == selectedGroup?.id,
);
setState(() {});
},
child: Container(
margin: const EdgeInsets.symmetric(
horizontal: 12,
vertical: 5,
),
padding: const EdgeInsets.symmetric(
vertical: 10,
horizontal: 15,
),
decoration: CustomTheme.standardBoxDecoration,
child: Row(
children: [
const Text(
'Group',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
),
),
const Spacer(),
Text(
selectedGroup == null ? 'None' : selectedGroup!.name,
),
const SizedBox(width: 10),
const Icon(Icons.arrow_forward_ios, size: 16),
],
),
),
),
Container(
decoration: CustomTheme.standardBoxDecoration, decoration: CustomTheme.standardBoxDecoration,
width: MediaQuery.of(context).size.width * 0.95, child: Row(
height: 400, children: [
padding: const EdgeInsets.all(12), const Text(
margin: const EdgeInsets.symmetric(vertical: 10), 'Ruleset',
child: const Center(child: Text('PlayerComponent')), style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
),
),
const Spacer(),
Text(
selectedRuleset == null
? 'None'
: translateRulesetToString(selectedRuleset!),
),
const SizedBox(width: 10),
const Icon(Icons.arrow_forward_ios, size: 16),
],
),
), ),
const Spacer(), ),
CustomWidthButton( GestureDetector(
text: 'Create game', onTap: () async {
sizeRelativeToWidth: 0.95, selectedGroup = await Navigator.of(context).push(
buttonType: ButtonType.primary, MaterialPageRoute(
onPressed: builder: (context) => ChooseGroupView(
(_gameNameController.text.isEmpty || groups: groupsList,
selectedGroup == null || initialGroupIndex: selectedGroupIndex,
selectedRuleset == null) ),
? null ),
: () async { );
Game game = Game( selectedGroupIndex = groupsList.indexWhere(
name: _gameNameController.text.trim(), (g) => g.id == selectedGroup?.id,
createdAt: DateTime.now(), );
group: selectedGroup!, print('selectedGroup: $selectedGroup');
); print(
// TODO: Replace with navigation to GameResultView() playerList
print('Created game: $game'); .where(
Navigator.pop(context); (p) => !selectedGroup!.members.any((m) => m.id == p.id),
}, )
.toList(),
);
setState(() {});
},
child: Container(
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 5),
padding: const EdgeInsets.symmetric(
vertical: 10,
horizontal: 15,
),
decoration: CustomTheme.standardBoxDecoration,
child: Row(
children: [
const Text(
'Group',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
),
),
const Spacer(),
Text(selectedGroup == null ? 'None' : selectedGroup!.name),
const SizedBox(width: 10),
const Icon(Icons.arrow_forward_ios, size: 16),
],
),
), ),
const SizedBox(height: 20), ),
], Expanded(
), child: PlayerSelection(
key: ValueKey(selectedGroup?.id ?? 'no_group'),
initialPlayers: selectedGroup == null
? playerList
: playerList
.where(
(p) => !selectedGroup!.members.any(
(m) => m.id == p.id,
),
)
.toList(),
onChanged: (value) {
print(value);
},
),
),
CustomWidthButton(
text: 'Create game',
sizeRelativeToWidth: 0.95,
buttonType: ButtonType.primary,
onPressed:
(_gameNameController.text.isEmpty ||
selectedGroup == null ||
selectedRuleset == null)
? null
: () async {
Game game = Game(
name: _gameNameController.text.trim(),
createdAt: DateTime.now(),
group: selectedGroup!,
);
// TODO: Replace with navigation to GameResultView()
print('Created game: $game');
Navigator.pop(context);
},
),
const SizedBox(height: 20),
],
), ),
), ),
); );

18
lib/presentation/widgets/player_selection.dart
View File

@@ -11,8 +11,13 @@ import 'package:provider/provider.dart';
class PlayerSelection extends StatefulWidget { class PlayerSelection extends StatefulWidget {
final Function(List<Player> value) onChanged; final Function(List<Player> value) onChanged;
final List<Player> initialPlayers;
const PlayerSelection({super.key, required this.onChanged}); const PlayerSelection({
super.key,
required this.onChanged,
this.initialPlayers = const [],
});
@override @override
State<PlayerSelection> createState() => _PlayerSelectionState(); State<PlayerSelection> createState() => _PlayerSelectionState();
@@ -46,9 +51,14 @@ class _PlayerSelectionState extends State<PlayerSelection> {
suggestedPlayers = skeletonData; suggestedPlayers = skeletonData;
_allPlayersFuture.then((loadedPlayers) { _allPlayersFuture.then((loadedPlayers) {
setState(() { setState(() {
loadedPlayers.sort((a, b) => a.name.compareTo(b.name)); if (widget.initialPlayers.isNotEmpty) {
allPlayers = [...loadedPlayers]; allPlayers = [...widget.initialPlayers];
suggestedPlayers = [...loadedPlayers]; suggestedPlayers = [...widget.initialPlayers];
} else {
loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
allPlayers = [...loadedPlayers];
suggestedPlayers = [...loadedPlayers];
}
}); });
}); });
} }