Merge branch 'development' into feature/132-verschiedene-regelsaetze-implementieren

# Conflicts: # lib/core/common.dart # lib/presentation/views/main_menu/statistics_view.dart # lib/presentation/widgets/player_selection.dart
2026-04-24 12:15:57 +02:00
parent 23b903e28a 39eba80e3f
commit 1d02c04b7a
17 changed files with 710 additions and 225 deletions
--- a/lib/presentation/views/main_menu/group_view/group_detail_view.dart
+++ b/lib/presentation/views/main_menu/group_view/group_detail_view.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import 'package:tallee/core/adaptive_page_route.dart';
+import 'package:tallee/core/common.dart';
 import 'package:tallee/core/custom_theme.dart';
 import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
@@ -147,6 +148,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                    children: _group.members.map((member) {
                      return TextIconTile(
                        text: member.name,
+                        suffixText: getNameCountText(member),
                        iconEnabled: false,
                      );
                    }).toList(),
--- a/lib/presentation/views/main_menu/match_view/match_detail_view.dart
+++ b/lib/presentation/views/main_menu/match_view/match_detail_view.dart
@@ -155,6 +155,7 @@ class _MatchDetailViewState extends State<MatchDetailView> {
                    children: match.players.map((player) {
                      return TextIconTile(
                        text: player.name,
+                        suffixText: getNameCountText(player),
                        iconEnabled: false,
                      );
                    }).toList(),
--- a/lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
+++ b/lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
@@ -30,7 +30,6 @@ const allDependencies = <Package>[
  _cli_util,
  _clock,
  _code_assets,
-  _code_builder,
  _collection,
  _convert,
  _coverage,
@@ -109,6 +108,7 @@ const allDependencies = <Package>[
  _pubspec_parse,
  _quiver,
  _recase,
+  _record_use,
  _retry,
  _rfc_6901,
  _safe_url_check,
@@ -567,17 +567,17 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
  );

-/// build_runner 2.13.1
+/// build_runner 2.14.0
 const _build_runner = Package(
    name: 'build_runner',
    description: 'A build system for Dart code generation and modular compilation.',
    repository: 'https://github.com/dart-lang/build/tree/master/build_runner',
    authors: [],
-    version: '2.13.1',
+    version: '2.14.0',
    spdxIdentifiers: ['BSD-3-Clause'],
    isMarkdown: false,
    isSdk: false,
-    dependencies: [PackageRef('analyzer'), PackageRef('args'), PackageRef('async'), PackageRef('build'), PackageRef('build_config'), PackageRef('build_daemon'), PackageRef('built_collection'), PackageRef('built_value'), PackageRef('code_builder'), PackageRef('collection'), PackageRef('convert'), PackageRef('crypto'), PackageRef('dart_style'), PackageRef('glob'), PackageRef('graphs'), PackageRef('http_multi_server'), PackageRef('io'), PackageRef('json_annotation'), PackageRef('logging'), PackageRef('meta'), PackageRef('mime'), PackageRef('package_config'), PackageRef('path'), PackageRef('pool'), PackageRef('pub_semver'), PackageRef('shelf'), PackageRef('shelf_web_socket'), PackageRef('stream_transform'), PackageRef('watcher'), PackageRef('web_socket_channel'), PackageRef('yaml')],
+    dependencies: [PackageRef('analyzer'), PackageRef('args'), PackageRef('async'), PackageRef('build'), PackageRef('build_config'), PackageRef('build_daemon'), PackageRef('built_collection'), PackageRef('built_value'), PackageRef('collection'), PackageRef('convert'), PackageRef('crypto'), PackageRef('dart_style'), PackageRef('glob'), PackageRef('graphs'), PackageRef('http_multi_server'), PackageRef('io'), PackageRef('json_annotation'), PackageRef('logging'), PackageRef('meta'), PackageRef('mime'), PackageRef('package_config'), PackageRef('path'), PackageRef('pool'), PackageRef('pub_semver'), PackageRef('shelf'), PackageRef('shelf_web_socket'), PackageRef('stream_transform'), PackageRef('watcher'), PackageRef('web_socket_channel'), PackageRef('yaml')],
    devDependencies: [PackageRef('stream_channel'), PackageRef('test')],
    license: '''Copyright 2016, the Dart project authors.

@@ -1153,47 +1153,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
  );

-/// code_builder 4.11.1
-const _code_builder = Package(
-    name: 'code_builder',
-    description: 'A fluent, builder-based library for generating valid Dart code.',
-    repository: 'https://github.com/dart-lang/tools/tree/main/pkgs/code_builder',
-    authors: [],
-    version: '4.11.1',
-    spdxIdentifiers: ['BSD-3-Clause'],
-    isMarkdown: false,
-    isSdk: false,
-    dependencies: [PackageRef('built_collection'), PackageRef('built_value'), PackageRef('collection'), PackageRef('matcher'), PackageRef('meta')],
-    devDependencies: [PackageRef('build'), PackageRef('build_runner'), PackageRef('dart_style'), PackageRef('source_gen'), PackageRef('test')],
-    license: '''Copyright 2016, the Dart project authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
-  );
-
 /// collection 1.19.1
 const _collection = Package(
    name: 'collection',
@@ -2892,17 +2851,17 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
  );

-/// hooks 1.0.2
+/// hooks 1.0.3
 const _hooks = Package(
    name: 'hooks',
    description: 'A library that contains a Dart API for the JSON-based protocol for `hook/build.dart` and `hook/link.dart`.',
    repository: 'https://github.com/dart-lang/native/tree/main/pkgs/hooks',
    authors: [],
-    version: '1.0.2',
+    version: '1.0.3',
    spdxIdentifiers: ['BSD-3-Clause'],
    isMarkdown: false,
    isSdk: false,
-    dependencies: [PackageRef('collection'), PackageRef('crypto'), PackageRef('logging'), PackageRef('meta'), PackageRef('pub_semver'), PackageRef('yaml')],
+    dependencies: [PackageRef('collection'), PackageRef('crypto'), PackageRef('logging'), PackageRef('meta'), PackageRef('pub_semver'), PackageRef('record_use'), PackageRef('yaml')],
    devDependencies: [PackageRef('args'), PackageRef('code_assets'), PackageRef('glob'), PackageRef('json_schema'), PackageRef('path'), PackageRef('test')],
    license: '''Copyright 2025, the Dart project authors.

@@ -5106,6 +5065,48 @@ Redistribution and use in source and binary forms, with or without modification,
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
  );

+/// record_use 0.6.0
+const _record_use = Package(
+    name: 'record_use',
+    description: '''The serialization logic and API for the usage recording SDK feature.
+''',
+    repository: 'https://github.com/dart-lang/native/tree/main/pkgs/record_use',
+    authors: [],
+    version: '0.6.0',
+    spdxIdentifiers: ['BSD-3-Clause'],
+    isMarkdown: false,
+    isSdk: false,
+    dependencies: [PackageRef('collection'), PackageRef('meta'), PackageRef('pub_semver')],
+    devDependencies: [PackageRef('json_schema'), PackageRef('test')],
+    license: '''Copyright 2024, the Dart project authors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google LLC nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
+  );
+
 /// retry 3.1.2
 const _retry = Package(
    name: 'retry',
@@ -37880,12 +37881,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.''',
  );

-/// tallee 0.0.21+255
+/// tallee 0.0.22+256
 const _tallee = Package(
    name: 'tallee',
    description: 'Tracking App for Card Games',
    authors: [],
-    version: '0.0.21+255',
+    version: '0.0.22+256',
    spdxIdentifiers: ['LGPL-3.0'],
    isMarkdown: false,
    isSdk: false,
--- a/lib/presentation/views/main_menu/statistics_view.dart
+++ b/lib/presentation/views/main_menu/statistics_view.dart
@@ -18,9 +18,18 @@ class StatisticsView extends StatefulWidget {
 }

 class _StatisticsViewState extends State<StatisticsView> {
-  List<(String, int)> winCounts = List.filled(6, ('Skeleton Player', 1));
-  List<(String, int)> matchCounts = List.filled(6, ('Skeleton Player', 1));
-  List<(String, double)> winRates = List.filled(6, ('Skeleton Player', 1));
+  List<(Player, int)> winCounts = List.filled(6, (
+    Player(name: 'Skeleton Player'),
+    1,
+  ));
+  List<(Player, int)> matchCounts = List.filled(6, (
+    Player(name: 'Skeleton Player'),
+    1,
+  ));
+  List<(Player, double)> winRates = List.filled(6, (
+    Player(name: 'Skeleton Player'),
+    1,
+  ));
  bool isLoading = true;

  @override
@@ -121,7 +130,10 @@ class _StatisticsViewState extends State<StatisticsView> {
        players: players,
        context: context,
      );
-      winRates = computeWinRatePercent(wins: winCounts, matches: matchCounts);
+      winRates = computeWinRatePercent(
+        winCounts: winCounts,
+        matchCounts: matchCounts,
+      );
      setState(() {
        isLoading = false;
      });
@@ -130,46 +142,46 @@ class _StatisticsViewState extends State<StatisticsView> {

  /// Calculates the number of wins for each player
  /// and returns a sorted list of tuples (playerName, winCount)
-  List<(String, int)> _calculateWinsForAllPlayers({
+  List<(Player, int)> _calculateWinsForAllPlayers({
    required List<Match> matches,
    required List<Player> players,
    required BuildContext context,
  }) {
-    List<(String, int)> winCounts = [];
+    List<(Player, int)> winCounts = [];
    final loc = AppLocalizations.of(context);

    // Getting the winners
    for (var match in matches) {
      final mvps = match.mvp;
      for (var winner in mvps) {
-        final index = winCounts.indexWhere((entry) => entry.$1 == winner.id);
+        final index = winCounts.indexWhere((entry) => entry.$1.id == winner.id);
        // -1 means winner not found in winCounts
        if (index != -1) {
          final current = winCounts[index].$2;
-          winCounts[index] = (winner.id, current + 1);
+          winCounts[index] = (winner, current + 1);
        } else {
-          winCounts.add((winner.id, 1));
+          winCounts.add((winner, 1));
        }
      }
    }

    // Adding all players with zero wins
    for (var player in players) {
-      final index = winCounts.indexWhere((entry) => entry.$1 == player.id);
+      final index = winCounts.indexWhere((entry) => entry.$1.id == player.id);
      // -1 means player not found in winCounts
      if (index == -1) {
-        winCounts.add((player.id, 0));
+        winCounts.add((player, 0));
      }
    }

    // Replace player IDs with names
    for (int i = 0; i < winCounts.length; i++) {
-      final playerId = winCounts[i].$1;
+      final playerId = winCounts[i].$1.id;
      final player = players.firstWhere(
        (p) => p.id == playerId,
        orElse: () => Player(id: playerId, name: loc.not_available),
      );
-      winCounts[i] = (player.name, winCounts[i].$2);
+      winCounts[i] = (player, winCounts[i].$2);
    }

    winCounts.sort((a, b) => b.$2.compareTo(a.$2));
@@ -179,59 +191,51 @@ class _StatisticsViewState extends State<StatisticsView> {

  /// Calculates the number of matches played for each player
  /// and returns a sorted list of tuples (playerName, matchCount)
-  List<(String, int)> _calculateMatchAmountsForAllPlayers({
+  List<(Player, int)> _calculateMatchAmountsForAllPlayers({
    required List<Match> matches,
    required List<Player> players,
    required BuildContext context,
  }) {
-    List<(String, int)> matchCounts = [];
+    List<(Player, int)> matchCounts = [];
    final loc = AppLocalizations.of(context);

    // Counting matches for each player
    for (var match in matches) {
-      if (match.group != null) {
-        final members = match.group!.members.map((p) => p.id).toList();
-        for (var playerId in members) {
-          final index = matchCounts.indexWhere((entry) => entry.$1 == playerId);
-          // -1 means player not found in matchCounts
-          if (index != -1) {
-            final current = matchCounts[index].$2;
-            matchCounts[index] = (playerId, current + 1);
-          } else {
-            matchCounts.add((playerId, 1));
-          }
-        }
-      }
-      final members = match.players.map((p) => p.id).toList();
-      for (var playerId in members) {
-        final index = matchCounts.indexWhere((entry) => entry.$1 == playerId);
-        // -1 means player not found in matchCounts
-        if (index != -1) {
-          final current = matchCounts[index].$2;
-          matchCounts[index] = (playerId, current + 1);
+      for (Player player in match.players) {
+        // Check if the player is already in matchCounts
+        final index = matchCounts.indexWhere(
+          (entry) => entry.$1.id == player.id,
+        );
+
+        // -1 -> not found
+        if (index == -1) {
+          // Add new entry
+          matchCounts.add((player, 1));
        } else {
-          matchCounts.add((playerId, 1));
+          // Update existing entry
+          final currentMatchAmount = matchCounts[index].$2;
+          matchCounts[index] = (player, currentMatchAmount + 1);
        }
      }
    }

    // Adding all players with zero matches
    for (var player in players) {
-      final index = matchCounts.indexWhere((entry) => entry.$1 == player.id);
+      final index = matchCounts.indexWhere((entry) => entry.$1.id == player.id);
      // -1 means player not found in matchCounts
      if (index == -1) {
-        matchCounts.add((player.id, 0));
+        matchCounts.add((player, 0));
      }
    }

    // Replace player IDs with names
    for (int i = 0; i < matchCounts.length; i++) {
-      final playerId = matchCounts[i].$1;
+      final playerId = matchCounts[i].$1.id;
      final player = players.firstWhere(
        (p) => p.id == playerId,
        orElse: () => Player(id: playerId, name: loc.not_available),
      );
-      matchCounts[i] = (player.name, matchCounts[i].$2);
+      matchCounts[i] = (player, matchCounts[i].$2);
    }

    matchCounts.sort((a, b) => b.$2.compareTo(a.$2));
@@ -239,25 +243,24 @@ class _StatisticsViewState extends State<StatisticsView> {
    return matchCounts;
  }

-  // dart
-  List<(String, double)> computeWinRatePercent({
-    required List<(String, int)> wins,
-    required List<(String, int)> matches,
+  List<(Player, double)> computeWinRatePercent({
+    required List<(Player, int)> winCounts,
+    required List<(Player, int)> matchCounts,
  }) {
-    final Map<String, int> winsMap = {for (var e in wins) e.$1: e.$2};
-    final Map<String, int> matchesMap = {for (var e in matches) e.$1: e.$2};
+    final Map<Player, int> winsMap = {for (var e in winCounts) e.$1: e.$2};
+    final Map<Player, int> matchesMap = {for (var e in matchCounts) e.$1: e.$2};

    // Get all unique player names
-    final names = {...winsMap.keys, ...matchesMap.keys};
+    final player = {...matchesMap.keys};

    // Calculate win rates
-    final result = names.map((name) {
+    final result = player.map((name) {
      final int w = winsMap[name] ?? 0;
-      final int g = matchesMap[name] ?? 0;
+      final int m = matchesMap[name] ?? 0;
      // Calculate percentage and round to 2 decimal places
      // Avoid division by zero
-      final double percent = (g > 0)
-          ? double.parse(((w / g)).toStringAsFixed(2))
+      final double percent = (m > 0)
+          ? double.parse(((w / m)).toStringAsFixed(2))
          : 0;
      return (name, percent);
    }).toList();