flixcoo/cabo-counter
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Felix Kirchner
2025-04-29 19:32:45 +02:00
parent 7a0959c263
commit 0e09f15c14
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/views/active_game_view.dart
View File

@@ -66,7 +66,7 @@ class _ActiveGameViewState extends State<ActiveGameView> {
), ),
ListView.builder( ListView.builder(
shrinkWrap: true, shrinkWrap: true,
itemCount: widget.gameSession.round, itemCount: widget.gameSession.roundNumber,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return Padding( return Padding(
padding: const EdgeInsets.all(1), padding: const EdgeInsets.all(1),
@@ -74,8 +74,8 @@ class _ActiveGameViewState extends State<ActiveGameView> {
title: Text( title: Text(
'Runde ${index + 1}', 'Runde ${index + 1}',
), ),
trailing: index + 1 != widget.gameSession.round || trailing: index + 1 != widget.gameSession.roundNumber ||
widget.gameSession.finished == true widget.gameSession.isGameFinished == true
? (const Text('\u{2705}', ? (const Text('\u{2705}',
style: TextStyle(fontSize: 22))) style: TextStyle(fontSize: 22)))
: const Text('\u{23F3}', : const Text('\u{23F3}',

4
lib/views/main_menu_view.dart
View File

@@ -91,7 +91,7 @@ class _MainMenuViewState extends State<MainMenuView> {
padding: const EdgeInsets.symmetric(vertical: 10.0), padding: const EdgeInsets.symmetric(vertical: 10.0),
child: CupertinoListTile( child: CupertinoListTile(
title: Text(session.gameTitle), title: Text(session.gameTitle),
subtitle: session.finished == true subtitle: session.isGameFinished == true
? Text( ? Text(
'\u{1F947} ${session.winner}', '\u{1F947} ${session.winner}',
style: const TextStyle(fontSize: 14), style: const TextStyle(fontSize: 14),
@@ -102,7 +102,7 @@ class _MainMenuViewState extends State<MainMenuView> {
), ),
trailing: Row( trailing: Row(
children: [ children: [
Text('${session.round}'), Text('${session.roundNumber}'),
const SizedBox(width: 3), const SizedBox(width: 3),
const Icon( const Icon(
CupertinoIcons.arrow_2_circlepath_circle_fill), CupertinoIcons.arrow_2_circlepath_circle_fill),

11
lib/views/round_view.dart
View File

@@ -41,8 +41,8 @@ class _RoundViewState extends State<RoundView> {
@override @override
void initState() { void initState() {
print('=== Runde ${widget.roundNumber} geöffnet ==='); print('=== Runde ${widget.roundNumber} geöffnet ===');
if (widget.roundNumber < widget.gameSession.round || if (widget.roundNumber < widget.gameSession.roundNumber ||
widget.gameSession.finished == true) { widget.gameSession.isGameFinished == true) {
print('Die Runde ${widget.roundNumber} wurde bereits gespielt, deshalb ' print('Die Runde ${widget.roundNumber} wurde bereits gespielt, deshalb '
'werden die alten Punktestaende angezeigt'); 'werden die alten Punktestaende angezeigt');
@@ -282,7 +282,7 @@ class _RoundViewState extends State<RoundView> {
onPressed: _areRoundInputsValid() onPressed: _areRoundInputsValid()
? () { ? () {
_finishRound(); _finishRound();
if (widget.gameSession.finished == true) { if (widget.gameSession.isGameFinished == true) {
Navigator.pop(context, widget.gameSession); Navigator.pop(context, widget.gameSession);
} else { } else {
Navigator.pushReplacement( Navigator.pushReplacement(
@@ -351,7 +351,8 @@ class _RoundViewState extends State<RoundView> {
print('===================================='); print('====================================');
print('Runde ${widget.roundNumber} beendet'); print('Runde ${widget.roundNumber} beendet');
// The shown round is smaller than the newest round // The shown round is smaller than the newest round
if (widget.gameSession.round < widget.gameSession.playerScores[0].length) { if (widget.gameSession.roundNumber <
widget.gameSession.playerScores[0].length) {
print('Da diese Runde bereits gespielt wurde, werden die alten ' print('Da diese Runde bereits gespielt wurde, werden die alten '
'Punktestaende ueberschrieben'); 'Punktestaende ueberschrieben');
print('Alte Punktestaende:'); print('Alte Punktestaende:');
@@ -360,7 +361,7 @@ class _RoundViewState extends State<RoundView> {
_calculateScoredPoints(); _calculateScoredPoints();
widget.gameSession.sumPoints(); widget.gameSession.sumPoints();
if (widget.gameSession.finished == true) { if (widget.gameSession.isGameFinished == true) {
print('Das Spiel ist beendet'); print('Das Spiel ist beendet');
} else { } else {
if (widget.roundNumber >= widget.gameSession.playerScores[0].length - 1) { if (widget.roundNumber >= widget.gameSession.playerScores[0].length - 1) {

2
pubspec.yaml
View File

@@ -2,7 +2,7 @@ name: cabo_counter
description: "Mobile app for the card game CABO" description: "Mobile app for the card game CABO"
publish_to: 'none' publish_to: 'none'
version: 0.1.3+55 version: 0.1.3+57
environment: environment:
sdk: ^3.5.4 sdk: ^3.5.4