Refactoring

lib/views/active_game_view.dart

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

lib/views/main_menu_view.dart

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

lib/views/round_view.dart

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

pubspec.yaml

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