Implemented ruleset in match view

# Conflicts:
#	lib/presentation/views/main_menu/match_view/match_result_view.dart

analysis_options.yaml

@@ -1,5 +1,9 @@
 include: package:flutter_lints/flutter.yaml
 
+analyzer:
+  exclude:
+    - lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
+
 linter:
   rules:
     avoid_print: false
@@ -12,7 +16,3 @@ linter:
     unnecessary_const: true
     lines_longer_than_80_chars: false
     constant_identifier_names: false
-
-analyzer:
-  exclude:
-    - lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart

lib/core/custom_theme.dart

@@ -85,21 +85,21 @@ class CustomTheme {
   );
 
   static const SearchBarThemeData searchBarTheme = SearchBarThemeData(
-    textStyle: WidgetStatePropertyAll(TextStyle(color: CustomTheme.textColor)),
+    textStyle: WidgetStatePropertyAll(TextStyle(color: textColor)),
-    hintStyle: WidgetStatePropertyAll(TextStyle(color: CustomTheme.hintColor)),
+    hintStyle: WidgetStatePropertyAll(TextStyle(color: hintColor)),
   );
 
   static final RadioThemeData radioTheme = RadioThemeData(
     fillColor: WidgetStateProperty.resolveWith<Color>((states) {
       if (states.contains(WidgetState.selected)) {
-        return CustomTheme.primaryColor;
+        return primaryColor;
       }
-      return CustomTheme.textColor;
+      return textColor;
     }),
   );
 
   static const InputDecorationTheme inputDecorationTheme = InputDecorationTheme(
-    labelStyle: TextStyle(color: CustomTheme.textColor),
+    labelStyle: TextStyle(color: textColor),
-    hintStyle: TextStyle(color: CustomTheme.hintColor),
+    hintStyle: TextStyle(color: hintColor),
   );
 }

lib/data/dao/match_dao.dart

@@ -30,9 +30,11 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         final players =
             await db.playerMatchDao.getPlayersOfMatch(matchId: row.id) ?? [];
 
-        final scores = await db.scoreDao.getAllMatchScores(matchId: row.id);
+        final scores = await db.scoreEntryDao.getAllMatchScores(
+          matchId: row.id,
+        );
 
-        final winner = await db.scoreDao.getWinner(matchId: row.id);
+        final winner = await db.scoreEntryDao.getWinner(matchId: row.id);
         return Match(
           id: row.id,
           name: row.name,
@@ -64,9 +66,9 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     final players =
         await db.playerMatchDao.getPlayersOfMatch(matchId: matchId) ?? [];
 
-    final scores = await db.scoreDao.getAllMatchScores(matchId: matchId);
+    final scores = await db.scoreEntryDao.getAllMatchScores(matchId: matchId);
 
-    final winner = await db.scoreDao.getWinner(matchId: matchId);
+    final winner = await db.scoreEntryDao.getWinner(matchId: matchId);
 
     return Match(
       id: result.id,
@@ -109,7 +111,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
 
       for (final pid in match.scores.keys) {
         final playerScores = match.scores[pid]!;
-        await db.scoreDao.addScoresAsList(
+        await db.scoreEntryDao.addScoresAsList(
           entrys: playerScores,
           playerId: pid,
           matchId: match.id,
@@ -117,7 +119,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
       }
 
       if (match.winner != null) {
-        await db.scoreDao.setWinner(
+        await db.scoreEntryDao.setWinner(
           matchId: match.id,
           playerId: match.winner!.id,
         );
@@ -298,7 +300,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         final group = await db.groupDao.getGroupById(groupId: groupId);
         final players =
             await db.playerMatchDao.getPlayersOfMatch(matchId: row.id) ?? [];
-        final winner = await db.scoreDao.getWinner(matchId: row.id);
+        final winner = await db.scoreEntryDao.getWinner(matchId: row.id);
         return Match(
           id: row.id,
           name: row.name,

lib/data/dao/score_entry_dao.dart

@@ -6,11 +6,12 @@ import 'package:tallee/data/db/tables/score_entry_table.dart';
 import 'package:tallee/data/models/player.dart';
 import 'package:tallee/data/models/score_entry.dart';
 
-part 'score_dao.g.dart';
+part 'score_entry_dao.g.dart';
 
 @DriftAccessor(tables: [ScoreEntryTable])
-class ScoreDao extends DatabaseAccessor<AppDatabase> with _$ScoreDaoMixin {
+class ScoreEntryDao extends DatabaseAccessor<AppDatabase>
-  ScoreDao(super.db);
+    with _$ScoreEntryDaoMixin {
+  ScoreEntryDao(super.db);
 
   /// Adds a score entry to the database.
   Future<void> addScore({

lib/data/dao/score_entry_dao.g.dart

@@ -1,20 +1,20 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'score_dao.dart';
+part of 'score_entry_dao.dart';
 
 // ignore_for_file: type=lint
-mixin _$ScoreDaoMixin on DatabaseAccessor<AppDatabase> {
+mixin _$ScoreEntryDaoMixin on DatabaseAccessor<AppDatabase> {
   $PlayerTableTable get playerTable => attachedDatabase.playerTable;
   $GameTableTable get gameTable => attachedDatabase.gameTable;
   $GroupTableTable get groupTable => attachedDatabase.groupTable;
   $MatchTableTable get matchTable => attachedDatabase.matchTable;
   $ScoreEntryTableTable get scoreEntryTable => attachedDatabase.scoreEntryTable;
-  ScoreDaoManager get managers => ScoreDaoManager(this);
+  ScoreEntryDaoManager get managers => ScoreEntryDaoManager(this);
 }
 
-class ScoreDaoManager {
+class ScoreEntryDaoManager {
-  final _$ScoreDaoMixin _db;
+  final _$ScoreEntryDaoMixin _db;
-  ScoreDaoManager(this._db);
+  ScoreEntryDaoManager(this._db);
   $$PlayerTableTableTableManager get playerTable =>
       $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
   $$GameTableTableTableManager get gameTable =>

lib/data/db/database.dart

@@ -7,7 +7,7 @@ import 'package:tallee/data/dao/match_dao.dart';
 import 'package:tallee/data/dao/player_dao.dart';
 import 'package:tallee/data/dao/player_group_dao.dart';
 import 'package:tallee/data/dao/player_match_dao.dart';
-import 'package:tallee/data/dao/score_dao.dart';
+import 'package:tallee/data/dao/score_entry_dao.dart';
 import 'package:tallee/data/dao/team_dao.dart';
 import 'package:tallee/data/db/tables/game_table.dart';
 import 'package:tallee/data/db/tables/group_table.dart';
@@ -38,7 +38,7 @@ part 'database.g.dart';
     PlayerGroupDao,
     PlayerMatchDao,
     GameDao,
-    ScoreDao,
+    ScoreEntryDao,
     TeamDao,
   ],
 )

lib/data/db/database.g.dart

@@ -2710,7 +2710,7 @@ abstract class _$AppDatabase extends GeneratedDatabase {
     this as AppDatabase,
   );
   late final GameDao gameDao = GameDao(this as AppDatabase);
-  late final ScoreDao scoreDao = ScoreDao(this as AppDatabase);
+  late final ScoreEntryDao scoreEntryDao = ScoreEntryDao(this as AppDatabase);
   late final TeamDao teamDao = TeamDao(this as AppDatabase);
   @override
   Iterable<TableInfo<Table, Object?>> get allTables =>

lib/l10n/arb/app_de.arb

@@ -22,10 +22,11 @@
   "days_ago": "vor {count} Tagen",
   "delete": "Löschen",
   "delete_all_data": "Alle Daten löschen",
-  "delete_group": "Diese Gruppe löschen",
+  "delete_group": "Gruppe löschen",
   "delete_match": "Spiel löschen",
   "edit_group": "Gruppe bearbeiten",
   "edit_match": "Gruppe bearbeiten",
+  "enter_points": "Punkte eingeben",
   "enter_results": "Ergebnisse eintragen",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
   "error_deleting_group": "Fehler beim Löschen der Gruppe, bitte erneut versuchen",
@@ -74,6 +75,7 @@
   "player_name": "Spieler:innenname",
   "players": "Spieler:innen",
   "players_count": "{count} Spieler",
+  "points": "Punkte",
   "privacy_policy": "Datenschutzerklärung",
   "quick_create": "Schnellzugriff",
   "recent_matches": "Letzte Spiele",
@@ -87,12 +89,14 @@
   "save_changes": "Änderungen speichern",
   "search_for_groups": "Nach Gruppen suchen",
   "search_for_players": "Nach Spieler:innen suchen",
-  "select_winner": "Gewinner:in wählen:",
+  "select_winner": "Gewinner:in wählen",
+  "select_loser": "Verlierer:in wählen",
   "selected_players": "Ausgewählte Spieler:innen",
   "settings": "Einstellungen",
   "single_loser": "Ein:e Verlierer:in",
   "single_winner": "Ein:e Gewinner:in",
   "highest_score": "Höchste Punkte",
+  "loser": "Verlierer:in",
   "lowest_score": "Niedrigste Punkte",
   "multiple_winners": "Mehrere Gewinner:innen",
   "statistics": "Statistiken",

lib/l10n/arb/app_en.arb

@@ -83,6 +83,9 @@
   "@edit_match": {
       "description": "Button & Appbar label for editing a match"
   },
+  "@enter_points": {
+    "description": "Label to enter players points"
+  },
   "@enter_results": {
     "description": "Button text to enter match results"
   },
@@ -232,6 +235,9 @@
       }
     }
   },
+  "@points": {
+    "description": "Points label"
+  },
   "@privacy_policy": {
     "description": "Privacy policy menu item"
   },
@@ -271,6 +277,9 @@
   "@select_winner": {
     "description": "Label to select the winner"
   },
+  "@select_loser": {
+    "description": "Label to select the loser"
+  },
   "@selected_players": {
     "description": "Shows the number of selected players"
   },
@@ -351,6 +360,7 @@
   "delete_match": "Delete Match",
   "edit_group": "Edit Group",
   "edit_match": "Edit Match",
+  "enter_points": "Enter points",
   "enter_results": "Enter Results",
   "error_creating_group": "Error while creating group, please try again",
   "error_deleting_group": "Error while deleting group, please try again",
@@ -399,6 +409,7 @@
   "player_name": "Player name",
   "players": "Players",
   "players_count": "{count} Players",
+  "points": "Points",
   "privacy_policy": "Privacy Policy",
   "quick_create": "Quick Create",
   "recent_matches": "Recent Matches",
@@ -411,12 +422,14 @@
   "save_changes": "Save Changes",
   "search_for_groups": "Search for groups",
   "search_for_players": "Search for players",
-  "select_winner": "Select Winner:",
+  "select_winner": "Select Winner",
+  "select_loser": "Select Loser",
   "selected_players": "Selected players",
   "settings": "Settings",
   "single_loser": "Single Loser",
   "single_winner": "Single Winner",
   "highest_score": "Highest Score",
+  "loser": "Loser",
   "lowest_score": "Lowest Score",
   "multiple_winners": "Multiple Winners",
   "statistics": "Statistics",

lib/l10n/generated/app_localizations.dart

@@ -254,6 +254,12 @@ abstract class AppLocalizations {
   /// **'Edit Match'**
   String get edit_match;
 
+  /// Label to enter players points
+  ///
+  /// In en, this message translates to:
+  /// **'Enter points'**
+  String get enter_points;
+
   /// Button text to enter match results
   ///
   /// In en, this message translates to:
@@ -542,6 +548,12 @@ abstract class AppLocalizations {
   /// **'{count} Players'**
   String players_count(int count);
 
+  /// Points label
+  ///
+  /// In en, this message translates to:
+  /// **'Points'**
+  String get points;
+
   /// Privacy policy menu item
   ///
   /// In en, this message translates to:
@@ -617,9 +629,15 @@ abstract class AppLocalizations {
   /// Label to select the winner
   ///
   /// In en, this message translates to:
-  /// **'Select Winner:'**
+  /// **'Select Winner'**
   String get select_winner;
 
+  /// Label to select the loser
+  ///
+  /// In en, this message translates to:
+  /// **'Select Loser'**
+  String get select_loser;
+
   /// Shows the number of selected players
   ///
   /// In en, this message translates to:
@@ -650,6 +668,12 @@ abstract class AppLocalizations {
   /// **'Highest Score'**
   String get highest_score;
 
+  /// No description provided for @loser.
+  ///
+  /// In en, this message translates to:
+  /// **'Loser'**
+  String get loser;
+
   /// No description provided for @lowest_score.
   ///
   /// In en, this message translates to:

lib/l10n/generated/app_localizations_de.dart

@@ -79,7 +79,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get delete_all_data => 'Alle Daten löschen';
 
   @override
-  String get delete_group => 'Diese Gruppe löschen';
+  String get delete_group => 'Gruppe löschen';
 
   @override
   String get delete_match => 'Spiel löschen';
@@ -90,6 +90,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get edit_match => 'Gruppe bearbeiten';
 
+  @override
+  String get enter_points => 'Punkte eingeben';
+
   @override
   String get enter_results => 'Ergebnisse eintragen';
 
@@ -240,6 +243,9 @@ class AppLocalizationsDe extends AppLocalizations {
     return '$count Spieler';
   }
 
+  @override
+  String get points => 'Punkte';
+
   @override
   String get privacy_policy => 'Datenschutzerklärung';
 
@@ -281,7 +287,10 @@ class AppLocalizationsDe extends AppLocalizations {
   String get search_for_players => 'Nach Spieler:innen suchen';
 
   @override
-  String get select_winner => 'Gewinner:in wählen:';
+  String get select_winner => 'Gewinner:in wählen';
+
+  @override
+  String get select_loser => 'Verlierer:in wählen';
 
   @override
   String get selected_players => 'Ausgewählte Spieler:innen';
@@ -298,6 +307,9 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get highest_score => 'Höchste Punkte';
 
+  @override
+  String get loser => 'Verlierer:in';
+
   @override
   String get lowest_score => 'Niedrigste Punkte';
 

lib/l10n/generated/app_localizations_en.dart

@@ -90,6 +90,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get edit_match => 'Edit Match';
 
+  @override
+  String get enter_points => 'Enter points';
+
   @override
   String get enter_results => 'Enter Results';
 
@@ -240,6 +243,9 @@ class AppLocalizationsEn extends AppLocalizations {
     return '$count Players';
   }
 
+  @override
+  String get points => 'Points';
+
   @override
   String get privacy_policy => 'Privacy Policy';
 
@@ -281,7 +287,10 @@ class AppLocalizationsEn extends AppLocalizations {
   String get search_for_players => 'Search for players';
 
   @override
-  String get select_winner => 'Select Winner:';
+  String get select_winner => 'Select Winner';
+
+  @override
+  String get select_loser => 'Select Loser';
 
   @override
   String get selected_players => 'Selected players';
@@ -298,6 +307,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get highest_score => 'Highest Score';
 
+  @override
+  String get loser => 'Loser';
+
   @override
   String get lowest_score => 'Lowest Score';
 

lib/presentation/views/main_menu/home_view.dart

@@ -227,7 +227,7 @@ class _HomeViewState extends State<HomeView> {
   /// Updates the winner information for a specific match in the recent matches list.
   Future<void> updatedWinnerInRecentMatches(String matchId) async {
     final db = Provider.of<AppDatabase>(context, listen: false);
-    final winner = await db.scoreDao.getWinner(matchId: matchId);
+    final winner = await db.scoreEntryDao.getWinner(matchId: matchId);
     final matchIndex = recentMatches.indexWhere((match) => match.id == matchId);
     if (matchIndex != -1) {
       setState(() {

lib/presentation/views/main_menu/match_view/match_detail_view.dart

@@ -4,6 +4,7 @@ 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';
 import 'package:tallee/data/models/match.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
@@ -175,37 +176,7 @@ class _MatchDetailViewState extends State<MatchDetailView> {
                       vertical: 4,
                       horizontal: 8,
                     ),
-                    child: Row(
+                    child: getResultWidget(loc),
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        /// TODO: Implement different ruleset results display
-                        if (match.winner != null) ...[
-                          Text(
-                            loc.winner,
-                            style: const TextStyle(
-                              fontSize: 16,
-                              color: CustomTheme.textColor,
-                            ),
-                          ),
-                          Text(
-                            match.winner!.name,
-                            style: const TextStyle(
-                              fontSize: 16,
-                              fontWeight: FontWeight.bold,
-                              color: CustomTheme.primaryColor,
-                            ),
-                          ),
-                        ] else ...[
-                          Text(
-                            loc.no_results_entered_yet,
-                            style: const TextStyle(
-                              fontSize: 14,
-                              color: CustomTheme.textColor,
-                            ),
-                          ),
-                        ],
-                      ],
-                    ),
                   ),
                 ),
               ],
@@ -264,4 +235,91 @@ class _MatchDetailViewState extends State<MatchDetailView> {
     });
     widget.onMatchUpdate.call();
   }
+
+  /// Returns the widget to be displayed in the result [InfoTile]
+  /// TODO: Update when score logic is overhauled
+  Widget getResultWidget(AppLocalizations loc) {
+    if (isSingleRowResult()) {
+      return Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: getResultRow(loc),
+      );
+    } else {
+      return Column(
+        children: [
+          for (var player in match.players)
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Text(
+                  player.name,
+                  style: const TextStyle(
+                    fontSize: 16,
+                    color: CustomTheme.textColor,
+                  ),
+                ),
+                Text(
+                  '0 ${loc.points}',
+                  style: const TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.bold,
+                    color: CustomTheme.primaryColor,
+                  ),
+                ),
+              ],
+            ),
+        ],
+      );
+    }
+  }
+
+  /// Returns the result row for single winner/loser rulesets or a placeholder
+  /// if no result is entered yet
+  /// TODO: Update when score logic is overhauled
+  List<Widget> getResultRow(AppLocalizations loc) {
+    if (match.winner != null && match.game.ruleset == Ruleset.singleWinner) {
+      return [
+        Text(
+          loc.winner,
+          style: const TextStyle(fontSize: 16, color: CustomTheme.textColor),
+        ),
+        Text(
+          match.winner!.name,
+          style: const TextStyle(
+            fontSize: 16,
+            fontWeight: FontWeight.bold,
+            color: CustomTheme.primaryColor,
+          ),
+        ),
+      ];
+    } else if (match.game.ruleset == Ruleset.singleLoser) {
+      return [
+        Text(
+          loc.loser,
+          style: const TextStyle(fontSize: 16, color: CustomTheme.textColor),
+        ),
+        Text(
+          match.winner!.name,
+          style: const TextStyle(
+            fontSize: 16,
+            fontWeight: FontWeight.bold,
+            color: CustomTheme.primaryColor,
+          ),
+        ),
+      ];
+    } else {
+      return [
+        Text(
+          loc.no_results_entered_yet,
+          style: const TextStyle(fontSize: 14, color: CustomTheme.textColor),
+        ),
+      ];
+    }
+  }
+
+  // Returns if the result can be displayed in a single row
+  bool isSingleRowResult() {
+    return match.game.ruleset == Ruleset.singleWinner ||
+        match.game.ruleset == Ruleset.singleLoser;
+  }
 }

lib/presentation/views/main_menu/match_view/match_result_view.dart

@@ -1,21 +1,33 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/core/enums.dart';
 import 'package:tallee/data/db/database.dart';
 import 'package:tallee/data/models/match.dart';
 import 'package:tallee/data/models/player.dart';
 import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:tallee/presentation/widgets/buttons/custom_width_button.dart';
 import 'package:tallee/presentation/widgets/tiles/custom_radio_list_tile.dart';
+import 'package:tallee/presentation/widgets/tiles/score_list_tile.dart';
 
 class MatchResultView extends StatefulWidget {
   /// A view that allows selecting and saving the winner of a match
   /// [match]: The match for which the winner is to be selected
   /// [onWinnerChanged]: Optional callback invoked when the winner is changed
-  const MatchResultView({super.key, required this.match, this.onWinnerChanged});
+  const MatchResultView({
+    super.key,
+    required this.match,
+    this.ruleset = Ruleset.singleWinner,
+    this.onWinnerChanged,
+  });
 
   /// The match for which the winner is to be selected
   final Match match;
 
+  /// The ruleset of the match, determines how the winner is selected or how
+  /// scores are entered
+  final Ruleset ruleset;
+
   /// Optional callback invoked when the winner is changed
   final VoidCallback? onWinnerChanged;
 
@@ -29,6 +41,9 @@ class _MatchResultViewState extends State<MatchResultView> {
   /// List of all players who participated in the match
   late final List<Player> allPlayers;
 
+  /// List of text controllers for score entry, one for each player
+  late final List<TextEditingController> controller;
+
   /// Currently selected winner player
   Player? _selectedPlayer;
 
@@ -39,10 +54,19 @@ class _MatchResultViewState extends State<MatchResultView> {
     allPlayers = widget.match.players;
     allPlayers.sort((a, b) => a.name.compareTo(b.name));
 
+    controller = List.generate(
+      allPlayers.length,
+      (index) => TextEditingController(),
+    );
+
     if (widget.match.winner != null) {
+      if (rulesetSupportsWinnerSelection()) {
         _selectedPlayer = allPlayers.firstWhere(
           (p) => p.id == widget.match.winner!.id,
         );
+      } else if (rulesetSupportsScoreEntry()) {
+        /// TODO: Update when score logic is overhauled
+      }
     }
     super.initState();
   }
@@ -50,6 +74,7 @@ class _MatchResultViewState extends State<MatchResultView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
+
     return Scaffold(
       backgroundColor: CustomTheme.backgroundColor,
       appBar: AppBar(
@@ -85,13 +110,14 @@ class _MatchResultViewState extends State<MatchResultView> {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Text(
-                      loc.select_winner,
+                      '${getTitleForRuleset(loc)}:',
                       style: const TextStyle(
                         fontSize: 18,
                         fontWeight: FontWeight.bold,
                       ),
                     ),
                     const SizedBox(height: 10),
+                    if (rulesetSupportsWinnerSelection())
                       Expanded(
                         child: RadioGroup<Player>(
                           groupValue: _selectedPlayer,
@@ -99,7 +125,6 @@ class _MatchResultViewState extends State<MatchResultView> {
                             setState(() {
                               _selectedPlayer = value;
                             });
-                          await _handleWinnerSaving();
                           },
                           child: ListView.builder(
                             itemCount: allPlayers.length,
@@ -118,17 +143,44 @@ class _MatchResultViewState extends State<MatchResultView> {
                                       (_selectedPlayer = value);
                                     }
                                   });
-                                await _handleWinnerSaving();
                                 },
                               );
                             },
                           ),
                         ),
                       ),
+                    if (rulesetSupportsScoreEntry())
+                      Expanded(
+                        child: ListView.separated(
+                          itemCount: allPlayers.length,
+                          itemBuilder: (context, index) {
+                            print(allPlayers[index].name);
+                            return ScoreListTile(
+                              text: allPlayers[index].name,
+                              controller: controller[index],
+                            );
+                          },
+                          separatorBuilder: (BuildContext context, int index) {
+                            return const Padding(
+                              padding: EdgeInsets.symmetric(vertical: 8.0),
+                              child: Divider(indent: 20),
+                            );
+                          },
+                        ),
+                      ),
                   ],
                 ),
               ),
             ),
+            CustomWidthButton(
+              text: loc.save_changes,
+              sizeRelativeToWidth: 0.95,
+              onPressed: () async {
+                await _handleSaving();
+                if (!context.mounted) return;
+                Navigator.of(context).pop(_selectedPlayer);
+              },
+            ),
           ],
         ),
       ),
@@ -137,15 +189,75 @@ class _MatchResultViewState extends State<MatchResultView> {
 
   /// Handles saving or removing the winner in the database
   /// based on the current selection.
-  Future<void> _handleWinnerSaving() async {
+  Future<void> _handleSaving() async {
+    if (widget.ruleset == Ruleset.singleWinner) {
+      await _handleWinner();
+    } else if (widget.ruleset == Ruleset.singleLoser) {
+      await _handleLoser();
+    } else if (widget.ruleset == Ruleset.lowestScore ||
+        widget.ruleset == Ruleset.highestScore) {
+      await _handleScores();
+    }
+
+    widget.onWinnerChanged?.call();
+  }
+
+  Future<bool> _handleWinner() async {
     if (_selectedPlayer == null) {
-      await db.scoreDao.removeWinner(matchId: widget.match.id);
+      await db.scoreEntryDao.removeWinner(matchId: widget.match.id);
     } else {
-      await db.scoreDao.setWinner(
+      await db.scoreEntryDao.setWinner(
         matchId: widget.match.id,
         playerId: _selectedPlayer!.id,
       );
     }
-    widget.onWinnerChanged?.call();
+  }
+
+  Future<bool> _handleLoser() async {
+    if (_selectedPlayer == null) {
+      /// TODO: Update when score logic is overhauled
+      return false;
+    } else {
+      /// TODO: Update when score logic is overhauled
+      return false;
+    }
+  }
+
+  /// Handles saving the scores for each player in the database.
+  Future<bool> _handleScores() async {
+    for (int i = 0; i < allPlayers.length; i++) {
+      var text = controller[i].text;
+      if (text.isEmpty) {
+        text = '0';
+      }
+      final score = int.parse(text);
+      await db.playerMatchDao.updatePlayerScore(
+        matchId: widget.match.id,
+        playerId: allPlayers[i].id,
+        newScore: score,
+      );
+    }
+    return false;
+  }
+
+  String getTitleForRuleset(AppLocalizations loc) {
+    switch (widget.ruleset) {
+      case Ruleset.singleWinner:
+        return loc.select_winner;
+      case Ruleset.singleLoser:
+        return loc.select_loser;
+      default:
+        return loc.enter_points;
+    }
+  }
+
+  bool rulesetSupportsWinnerSelection() {
+    return widget.ruleset == Ruleset.singleWinner ||
+        widget.ruleset == Ruleset.singleLoser;
+  }
+
+  bool rulesetSupportsScoreEntry() {
+    return widget.ruleset == Ruleset.lowestScore ||
+        widget.ruleset == Ruleset.highestScore;
   }
 }

lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart

@@ -70,6 +70,8 @@ const allDependencies = <Package>[
   _http_parser,
   _intl,
   _io,
+  _jni,
+  _jni_flutter,
   _js,
   _json_annotation,
   _json_schema,
@@ -360,13 +362,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// async 2.13.0
+/// async 2.13.1
 const _async = Package(
     name: 'async',
     description: "Utility functions and classes related to the 'dart:async' library.",
     repository: 'https://github.com/dart-lang/core/tree/main/pkgs/async',
     authors: [],
-    version: '2.13.0',
+    version: '2.13.1',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -442,13 +444,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// build 4.0.4
+/// build 4.0.5
 const _build = Package(
     name: 'build',
     description: 'A package for authoring build_runner compatible code generators.',
     repository: 'https://github.com/dart-lang/build/tree/master/build',
     authors: [],
-    version: '4.0.4',
+    version: '4.0.5',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -565,13 +567,13 @@ 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.12.2
+/// build_runner 2.13.1
 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.12.2',
+    version: '2.13.1',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -649,14 +651,14 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// built_value 8.12.4
+/// built_value 8.12.5
 const _built_value = Package(
     name: 'built_value',
     description: '''Value types with builders, Dart classes as enums, and serialization. This library is the runtime dependency.
 ''',
     repository: 'https://github.com/google/built_value.dart/tree/master/built_value',
     authors: [],
-    version: '8.12.4',
+    version: '8.12.5',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -1436,18 +1438,18 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// cupertino_icons 1.0.8
+/// cupertino_icons 1.0.9
 const _cupertino_icons = Package(
     name: 'cupertino_icons',
     description: 'Default icons asset for Cupertino widgets based on Apple styled icons',
     repository: 'https://github.com/flutter/packages/tree/main/third_party/packages/cupertino_icons',
     authors: [],
-    version: '1.0.8',
+    version: '1.0.9',
     spdxIdentifiers: ['MIT'],
     isMarkdown: false,
     isSdk: false,
     dependencies: [],
-    devDependencies: [PackageRef('flutter'), PackageRef('flutter_test')],
+    devDependencies: [PackageRef('collection'), PackageRef('flutter'), PackageRef('flutter_test'), PackageRef('path')],
     license: '''The MIT License (MIT)
 
 Copyright (c) 2016 Vladimir Kharlampidi
@@ -2627,13 +2629,13 @@ const _flutter_localizations = Package(
     devDependencies: [PackageRef('flutter_test')],
   );
 
-/// flutter_plugin_android_lifecycle 2.0.33
+/// flutter_plugin_android_lifecycle 2.0.34
 const _flutter_plugin_android_lifecycle = Package(
     name: 'flutter_plugin_android_lifecycle',
     description: 'Flutter plugin for accessing an Android Lifecycle within other plugins.',
     repository: 'https://github.com/flutter/packages/tree/main/packages/flutter_plugin_android_lifecycle',
     authors: [],
-    version: '2.0.33',
+    version: '2.0.34',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -3173,6 +3175,88 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
+/// jni 1.0.0
+const _jni = Package(
+    name: 'jni',
+    description: 'A library to access JNI from Dart and Flutter that acts as a support library for package:jnigen.',
+    repository: 'https://github.com/dart-lang/native/tree/main/pkgs/jni',
+    authors: [],
+    version: '1.0.0',
+    spdxIdentifiers: ['BSD-3-Clause'],
+    isMarkdown: false,
+    isSdk: false,
+    dependencies: [PackageRef('args'), PackageRef('collection'), PackageRef('ffi'), PackageRef('meta'), PackageRef('package_config'), PackageRef('path'), PackageRef('plugin_platform_interface')],
+    devDependencies: [PackageRef('dart_style'), PackageRef('logging'), PackageRef('test')],
+    license: '''Copyright 2022, 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.''',
+  );
+
+/// jni_flutter 1.0.1
+const _jni_flutter = Package(
+    name: 'jni_flutter',
+    description: 'A library to access Flutter Android specific APIs from Dart.',
+    repository: 'https://github.com/dart-lang/native/tree/main/pkgs/jni_flutter',
+    authors: [],
+    version: '1.0.1',
+    spdxIdentifiers: ['BSD-3-Clause'],
+    isMarkdown: false,
+    isSdk: false,
+    dependencies: [PackageRef('flutter'), PackageRef('jni')],
+    devDependencies: [PackageRef('flutter_test')],
+    license: '''Copyright 2026, 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.''',
+  );
+
 /// js 0.7.2
 const _js = Package(
     name: 'js',
@@ -3511,13 +3595,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// markdown 7.3.0
+/// markdown 7.3.1
 const _markdown = Package(
     name: 'markdown',
     description: 'A portable Markdown library written in Dart that can parse Markdown into HTML.',
     repository: 'https://github.com/dart-lang/tools/tree/main/pkgs/markdown',
     authors: [],
-    version: '7.3.0',
+    version: '7.3.1',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -3890,13 +3974,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// native_toolchain_c 0.17.5
+/// native_toolchain_c 0.17.6
 const _native_toolchain_c = Package(
     name: 'native_toolchain_c',
     description: 'A library to invoke the native C compiler installed on the host machine.',
     repository: 'https://github.com/dart-lang/native/tree/main/pkgs/native_toolchain_c',
     authors: [],
-    version: '0.17.5',
+    version: '0.17.6',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -4110,14 +4194,14 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// package_info_plus 9.0.0
+/// package_info_plus 9.0.1
 const _package_info_plus = Package(
     name: 'package_info_plus',
     description: 'Flutter plugin for querying information about the application package, such as CFBundleVersion on iOS or versionCode on Android.',
     homepage: 'https://github.com/fluttercommunity/plus_plugins',
     repository: 'https://github.com/fluttercommunity/plus_plugins/tree/main/packages/package_info_plus/package_info_plus',
     authors: [],
-    version: '9.0.0',
+    version: '9.0.1',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -4194,13 +4278,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// pana 0.23.10
+/// pana 0.23.11
 const _pana = Package(
     name: 'pana',
     description: 'PAckage aNAlyzer - produce a report summarizing the health and quality of a Dart package.',
     repository: 'https://github.com/dart-lang/pana',
     authors: [],
-    version: '0.23.10',
+    version: '0.23.11',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -4315,17 +4399,17 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// path_provider_android 2.2.22
+/// path_provider_android 2.3.1
 const _path_provider_android = Package(
     name: 'path_provider_android',
     description: 'Android implementation of the path_provider plugin.',
     repository: 'https://github.com/flutter/packages/tree/main/packages/path_provider/path_provider_android',
     authors: [],
-    version: '2.2.22',
+    version: '2.3.1',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
-    dependencies: [PackageRef('flutter'), PackageRef('path_provider_platform_interface')],
+    dependencies: [PackageRef('flutter'), PackageRef('jni'), PackageRef('jni_flutter'), PackageRef('path_provider_platform_interface')],
     devDependencies: [PackageRef('flutter_test'), PackageRef('test')],
     license: '''Copyright 2013 The Flutter Authors
 
@@ -36119,13 +36203,13 @@ Copyright (C) 2009-2017, International Business Machines Corporation,
 Google, and others. All Rights Reserved.''',
   );
 
-/// source_gen 4.2.0
+/// source_gen 4.2.2
 const _source_gen = Package(
     name: 'source_gen',
     description: 'Source code generation builders and utilities for the Dart build system',
     repository: 'https://github.com/dart-lang/source_gen/tree/master/source_gen',
     authors: [],
-    version: '4.2.0',
+    version: '4.2.2',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -36835,13 +36919,13 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// url_launcher_android 6.3.28
+/// url_launcher_android 6.3.29
 const _url_launcher_android = Package(
     name: 'url_launcher_android',
     description: 'Android implementation of the url_launcher plugin.',
     repository: 'https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_android',
     authors: [],
-    version: '6.3.28',
+    version: '6.3.29',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -37796,12 +37880,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.''',
   );
 
-/// tallee 0.0.19+253
+/// tallee 0.0.20+254
 const _tallee = Package(
     name: 'tallee',
     description: 'Tracking App for Card Games',
     authors: [],
-    version: '0.0.19+253',
+    version: '0.0.20+254',
     spdxIdentifiers: ['LGPL-3.0'],
     isMarkdown: false,
     isSdk: false,

lib/presentation/widgets/tiles/match_tile.dart

@@ -79,6 +79,24 @@ class _MatchTileState extends State<MatchTile> {
               ],
             ),
 
+            const SizedBox(height: 4),
+
+            Container(
+              decoration: BoxDecoration(
+                color: CustomTheme.primaryColor,
+                borderRadius: BorderRadius.circular(8),
+              ),
+              padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
+              child: Text(
+                translateRulesetToString(match.game.ruleset, context),
+                style: const TextStyle(
+                  fontSize: 12,
+                  color: Colors.white,
+                  fontWeight: FontWeight.bold,
+                ),
+              ),
+            ),
+
             const SizedBox(height: 8),
 
             if (group != null) ...[

lib/presentation/widgets/tiles/score_list_tile.dart

@@ -0,0 +1,91 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/l10n/generated/app_localizations.dart';
+
+class ScoreListTile extends StatelessWidget {
+  /// A custom list tile widget that has a text field for inputting a score.
+  /// - [text]: The leading text to be displayed.
+  /// - [controller]: The controller for the text field to input the score.
+  const ScoreListTile({
+    super.key,
+    required this.text,
+    required this.controller,
+    /*
+    required this.onContainerTap,
+*/
+  });
+
+  /// The text to display next to the radio button.
+  final String text;
+
+  final TextEditingController controller;
+
+  /// The callback invoked when the container is tapped.
+  /*
+  final ValueChanged<T> onContainerTap;
+*/
+
+  @override
+  Widget build(BuildContext context) {
+    final loc = AppLocalizations.of(context);
+
+    return Container(
+      margin: const EdgeInsets.symmetric(horizontal: 5, vertical: 5),
+      padding: const EdgeInsets.symmetric(horizontal: 20),
+      decoration: const BoxDecoration(color: CustomTheme.boxColor),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          Text(
+            text,
+            overflow: TextOverflow.ellipsis,
+            style: const TextStyle(fontSize: 17, fontWeight: FontWeight.w500),
+          ),
+          SizedBox(
+            width: 100,
+            height: 40,
+            child: TextField(
+              controller: controller,
+              keyboardType: TextInputType.number,
+              maxLength: 4,
+              inputFormatters: [FilteringTextInputFormatter.digitsOnly],
+              textAlign: TextAlign.center,
+              style: const TextStyle(
+                fontSize: 16,
+                fontWeight: FontWeight.w600,
+                color: CustomTheme.textColor,
+              ),
+              cursorColor: CustomTheme.textColor,
+              decoration: InputDecoration(
+                hintText: loc.points,
+                counterText: '',
+                filled: true,
+                fillColor: CustomTheme.onBoxColor,
+                contentPadding: const EdgeInsets.symmetric(
+                  horizontal: 0,
+                  vertical: 0,
+                ),
+                enabledBorder: OutlineInputBorder(
+                  borderRadius: BorderRadius.circular(8),
+                  borderSide: BorderSide(
+                    color: CustomTheme.textColor.withAlpha(100),
+                    width: 2,
+                  ),
+                ),
+                focusedBorder: OutlineInputBorder(
+                  borderRadius: BorderRadius.circular(8),
+                  borderSide: const BorderSide(
+                    color: CustomTheme.primaryColor,
+                    width: 2,
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

pubspec.yaml

@@ -1,7 +1,7 @@
 name: tallee
 description: "Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.19+253
+version: 0.0.20+254
 
 environment:
   sdk: ^3.8.1

test/db_tests/aggregates/match_test.dart

@@ -296,7 +296,7 @@ void main() {
     test('Setting a winner works correctly', () async {
       await database.matchDao.addMatch(match: testMatch1);
 
-      await database.scoreDao.setWinner(
+      await database.scoreEntryDao.setWinner(
         matchId: testMatch1.id,
         playerId: testPlayer5.id,
       );

test/db_tests/values/score_test.dart

@@ -70,13 +70,13 @@ void main() {
     group('Adding and Fetching scores', () {
       test('Single Score', () async {
         ScoreEntry entry = ScoreEntry(roundNumber: 1, score: 10, change: 10);
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: entry,
         );
 
-        final score = await database.scoreDao.getScore(
+        final score = await database.scoreEntryDao.getScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           roundNumber: 1,
@@ -95,13 +95,13 @@ void main() {
           ScoreEntry(roundNumber: 3, score: 18, change: 6),
         ];
 
-        await database.scoreDao.addScoresAsList(
+        await database.scoreEntryDao.addScoresAsList(
           entrys: entryList,
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
         );
 
-        final scores = await database.scoreDao.getAllPlayerScoresInMatch(
+        final scores = await database.scoreEntryDao.getAllPlayerScoresInMatch(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
         );
@@ -120,13 +120,13 @@ void main() {
     group('Undesirable values', () {
       test('Score & Round can have negative values', () async {
         ScoreEntry entry = ScoreEntry(roundNumber: -2, score: -10, change: -10);
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: entry,
         );
 
-        final score = await database.scoreDao.getScore(
+        final score = await database.scoreEntryDao.getScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           roundNumber: -2,
@@ -140,13 +140,13 @@ void main() {
 
       test('Score & Round can have zero values', () async {
         ScoreEntry entry = ScoreEntry(roundNumber: 0, score: 0, change: 0);
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: entry,
         );
 
-        final score = await database.scoreDao.getScore(
+        final score = await database.scoreEntryDao.getScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           roundNumber: 0,
@@ -158,7 +158,7 @@ void main() {
       });
 
       test('Getting score for a non-existent entities returns null', () async {
-        var score = await database.scoreDao.getScore(
+        var score = await database.scoreEntryDao.getScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           roundNumber: -1,
@@ -166,14 +166,14 @@ void main() {
 
         expect(score, isNull);
 
-        score = await database.scoreDao.getScore(
+        score = await database.scoreEntryDao.getScore(
           playerId: 'non-existin-player',
           matchId: testMatch1.id,
         );
 
         expect(score, isNull);
 
-        score = await database.scoreDao.getScore(
+        score = await database.scoreEntryDao.getScore(
           playerId: testPlayer1.id,
           matchId: 'non-existing-match',
         );
@@ -183,19 +183,19 @@ void main() {
 
       test('Getting score for a non-match player returns null', () async {
         ScoreEntry entry = ScoreEntry(roundNumber: 1, score: 10, change: 10);
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: entry,
         );
 
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer3.id,
           matchId: testMatch2.id,
           entry: entry,
         );
 
-        var score = await database.scoreDao.getScore(
+        var score = await database.scoreEntryDao.getScore(
           playerId: testPlayer1.id,
           matchId: testMatch2.id,
           roundNumber: 1,
@@ -210,23 +210,23 @@ void main() {
         ScoreEntry entry1 = ScoreEntry(roundNumber: 1, score: 10, change: 10);
         ScoreEntry entry2 = ScoreEntry(roundNumber: 1, score: 20, change: 20);
         ScoreEntry entry3 = ScoreEntry(roundNumber: 2, score: 25, change: 15);
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: entry1,
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer2.id,
           matchId: testMatch1.id,
           entry: entry2,
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: entry3,
         );
 
-        final scores = await database.scoreDao.getAllMatchScores(
+        final scores = await database.scoreEntryDao.getAllMatchScores(
           matchId: testMatch1.id,
         );
 
@@ -236,7 +236,7 @@ void main() {
       });
 
       test('getAllMatchScores() with no scores saved', () async {
-        final scores = await database.scoreDao.getAllMatchScores(
+        final scores = await database.scoreEntryDao.getAllMatchScores(
           matchId: testMatch1.id,
         );
 
@@ -247,18 +247,19 @@ void main() {
         ScoreEntry entry1 = ScoreEntry(roundNumber: 1, score: 10, change: 10);
         ScoreEntry entry2 = ScoreEntry(roundNumber: 2, score: 25, change: 15);
         ScoreEntry entry3 = ScoreEntry(roundNumber: 1, score: 30, change: 30);
-        await database.scoreDao.addScoresAsList(
+        await database.scoreEntryDao.addScoresAsList(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entrys: [entry1, entry2],
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer2.id,
           matchId: testMatch1.id,
           entry: entry3,
         );
 
-        final playerScores = await database.scoreDao.getAllPlayerScoresInMatch(
+        final playerScores = await database.scoreEntryDao
+            .getAllPlayerScoresInMatch(
               playerId: testPlayer1.id,
               matchId: testMatch1.id,
             );
@@ -273,7 +274,8 @@ void main() {
       });
 
       test('getAllPlayerScoresInMatch() with no scores saved', () async {
-        final playerScores = await database.scoreDao.getAllPlayerScoresInMatch(
+        final playerScores = await database.scoreEntryDao
+            .getAllPlayerScoresInMatch(
               playerId: testPlayer1.id,
               matchId: testMatch1.id,
             );
@@ -284,18 +286,19 @@ void main() {
       test('Scores are isolated across different matches', () async {
         ScoreEntry entry1 = ScoreEntry(roundNumber: 1, score: 10, change: 10);
         ScoreEntry entry2 = ScoreEntry(roundNumber: 1, score: 50, change: 50);
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: entry1,
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch2.id,
           entry: entry2,
         );
 
-        final match1Scores = await database.scoreDao.getAllPlayerScoresInMatch(
+        final match1Scores = await database.scoreEntryDao
+            .getAllPlayerScoresInMatch(
               playerId: testPlayer1.id,
               matchId: testMatch1.id,
             );
@@ -304,7 +307,8 @@ void main() {
         expect(match1Scores[0].score, 10);
         expect(match1Scores[0].change, 10);
 
-        final match2Scores = await database.scoreDao.getAllPlayerScoresInMatch(
+        final match2Scores = await database.scoreEntryDao
+            .getAllPlayerScoresInMatch(
               playerId: testPlayer1.id,
               matchId: testMatch2.id,
             );
@@ -319,19 +323,19 @@ void main() {
       test('updateScore()', () async {
         ScoreEntry entry1 = ScoreEntry(roundNumber: 1, score: 10, change: 10);
         ScoreEntry entry2 = ScoreEntry(roundNumber: 2, score: 15, change: 5);
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: entry1,
         );
 
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: entry2,
         );
 
-        final updated = await database.scoreDao.updateScore(
+        final updated = await database.scoreEntryDao.updateScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           newEntry: ScoreEntry(roundNumber: 2, score: 50, change: 40),
@@ -339,7 +343,7 @@ void main() {
 
         expect(updated, true);
 
-        final score = await database.scoreDao.getScore(
+        final score = await database.scoreEntryDao.getScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           roundNumber: 2,
@@ -351,7 +355,7 @@ void main() {
       });
 
       test('Updating a non-existent score returns false', () async {
-        final updated = await database.scoreDao.updateScore(
+        final updated = await database.scoreEntryDao.updateScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           newEntry: ScoreEntry(roundNumber: 1, score: 20, change: 20),
@@ -363,13 +367,13 @@ void main() {
 
     group('Deleting scores', () {
       test('deleteScore() ', () async {
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 1, score: 10, change: 10),
         );
 
-        final deleted = await database.scoreDao.deleteScore(
+        final deleted = await database.scoreEntryDao.deleteScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           roundNumber: 1,
@@ -377,7 +381,7 @@ void main() {
 
         expect(deleted, true);
 
-        final score = await database.scoreDao.getScore(
+        final score = await database.scoreEntryDao.getScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           roundNumber: 1,
@@ -387,7 +391,7 @@ void main() {
       });
 
       test('Deleting a non-existent score returns false', () async {
-        final deleted = await database.scoreDao.deleteScore(
+        final deleted = await database.scoreEntryDao.deleteScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           roundNumber: 1,
@@ -397,72 +401,75 @@ void main() {
       });
 
       test('deleteAllScoresForMatch() works correctly', () async {
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 1, score: 10, change: 10),
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer2.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 1, score: 20, change: 20),
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch2.id,
           entry: ScoreEntry(roundNumber: 1, score: 15, change: 15),
         );
 
-        final deleted = await database.scoreDao.deleteAllScoresForMatch(
+        final deleted = await database.scoreEntryDao.deleteAllScoresForMatch(
           matchId: testMatch1.id,
         );
 
         expect(deleted, true);
 
-        final match1Scores = await database.scoreDao.getAllMatchScores(
+        final match1Scores = await database.scoreEntryDao.getAllMatchScores(
           matchId: testMatch1.id,
         );
         expect(match1Scores.length, 0);
 
-        final match2Scores = await database.scoreDao.getAllMatchScores(
+        final match2Scores = await database.scoreEntryDao.getAllMatchScores(
           matchId: testMatch2.id,
         );
         expect(match2Scores.length, 1);
       });
 
       test('deleteAllScoresForPlayerInMatch() works correctly', () async {
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 1, score: 10, change: 10),
         );
 
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 2, score: 15, change: 5),
         );
 
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer2.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 1, score: 6, change: 6),
         );
 
-        final deleted = await database.scoreDao.deleteAllScoresForPlayerInMatch(
+        final deleted = await database.scoreEntryDao
+            .deleteAllScoresForPlayerInMatch(
               playerId: testPlayer1.id,
               matchId: testMatch1.id,
             );
 
         expect(deleted, true);
 
-        final player1Scores = await database.scoreDao.getAllPlayerScoresInMatch(
+        final player1Scores = await database.scoreEntryDao
+            .getAllPlayerScoresInMatch(
               playerId: testPlayer1.id,
               matchId: testMatch1.id,
             );
         expect(player1Scores.length, 0);
 
-        final player2Scores = await database.scoreDao.getAllPlayerScoresInMatch(
+        final player2Scores = await database.scoreEntryDao
+            .getAllPlayerScoresInMatch(
               playerId: testPlayer2.id,
               matchId: testMatch1.id,
             );
@@ -472,52 +479,52 @@ void main() {
 
     group('Score Aggregations & Edge Cases', () {
       test('getLatestRoundNumber()', () async {
-        var latestRound = await database.scoreDao.getLatestRoundNumber(
+        var latestRound = await database.scoreEntryDao.getLatestRoundNumber(
           matchId: testMatch1.id,
         );
         expect(latestRound, isNull);
 
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 1, score: 10, change: 10),
         );
 
-        latestRound = await database.scoreDao.getLatestRoundNumber(
+        latestRound = await database.scoreEntryDao.getLatestRoundNumber(
           matchId: testMatch1.id,
         );
         expect(latestRound, 1);
 
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 5, score: 50, change: 40),
         );
 
-        latestRound = await database.scoreDao.getLatestRoundNumber(
+        latestRound = await database.scoreEntryDao.getLatestRoundNumber(
           matchId: testMatch1.id,
         );
         expect(latestRound, 5);
       });
 
       test('getLatestRoundNumber() with non-consecutive rounds', () async {
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 1, score: 10, change: 10),
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 5, score: 50, change: 40),
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 3, score: 30, change: 20),
         );
 
-        final latestRound = await database.scoreDao.getLatestRoundNumber(
+        final latestRound = await database.scoreEntryDao.getLatestRoundNumber(
           matchId: testMatch1.id,
         );
 
@@ -525,29 +532,29 @@ void main() {
       });
 
       test('getTotalScoreForPlayer()', () async {
-        var totalScore = await database.scoreDao.getTotalScoreForPlayer(
+        var totalScore = await database.scoreEntryDao.getTotalScoreForPlayer(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
         );
         expect(totalScore, 0);
 
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 1, score: 10, change: 10),
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 2, score: 25, change: 15),
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 3, score: 40, change: 15),
         );
 
-        totalScore = await database.scoreDao.getTotalScoreForPlayer(
+        totalScore = await database.scoreEntryDao.getTotalScoreForPlayer(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
         );
@@ -555,23 +562,23 @@ void main() {
       });
 
       test('getTotalScoreForPlayer() ignores round score', () async {
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 2, score: 25, change: 25),
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 1, score: 25, change: 10),
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 3, score: 25, change: 25),
         );
 
-        final totalScore = await database.scoreDao.getTotalScoreForPlayer(
+        final totalScore = await database.scoreEntryDao.getTotalScoreForPlayer(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
         );
@@ -581,18 +588,18 @@ void main() {
       });
 
       test('Adding the same score twice replaces the existing one', () async {
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 1, score: 10, change: 10),
         );
-        await database.scoreDao.addScore(
+        await database.scoreEntryDao.addScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           entry: ScoreEntry(roundNumber: 1, score: 20, change: 20),
         );
 
-        final score = await database.scoreDao.getScore(
+        final score = await database.scoreEntryDao.getScore(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
           roundNumber: 1,
@@ -606,100 +613,116 @@ void main() {
 
     group('Handling Winner', () {
       test('hasWinner() works correctly', () async {
-        var hasWinner = await database.scoreDao.hasWinner(
+        var hasWinner = await database.scoreEntryDao.hasWinner(
           matchId: testMatch1.id,
         );
         expect(hasWinner, false);
 
-        await database.scoreDao.setWinner(
+        await database.scoreEntryDao.setWinner(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
         );
 
-        hasWinner = await database.scoreDao.hasWinner(matchId: testMatch1.id);
+        hasWinner = await database.scoreEntryDao.hasWinner(
+          matchId: testMatch1.id,
+        );
         expect(hasWinner, true);
       });
 
       test('getWinnersForMatch() returns correct winner', () async {
-        var winner = await database.scoreDao.getWinner(matchId: testMatch1.id);
+        var winner = await database.scoreEntryDao.getWinner(
+          matchId: testMatch1.id,
+        );
         expect(winner, isNull);
 
-        await database.scoreDao.setWinner(
+        await database.scoreEntryDao.setWinner(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
         );
 
-        winner = await database.scoreDao.getWinner(matchId: testMatch1.id);
+        winner = await database.scoreEntryDao.getWinner(matchId: testMatch1.id);
 
         expect(winner, isNotNull);
         expect(winner!.id, testPlayer1.id);
       });
 
       test('removeWinner() works correctly', () async {
-        var removed = await database.scoreDao.removeWinner(
+        var removed = await database.scoreEntryDao.removeWinner(
           matchId: testMatch1.id,
         );
         expect(removed, false);
 
-        await database.scoreDao.setWinner(
+        await database.scoreEntryDao.setWinner(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
         );
 
-        removed = await database.scoreDao.removeWinner(matchId: testMatch1.id);
+        removed = await database.scoreEntryDao.removeWinner(
+          matchId: testMatch1.id,
+        );
         expect(removed, true);
 
-        var winner = await database.scoreDao.getWinner(matchId: testMatch1.id);
+        var winner = await database.scoreEntryDao.getWinner(
+          matchId: testMatch1.id,
+        );
         expect(winner, isNull);
       });
     });
 
     group('Handling Looser', () {
       test('hasLooser() works correctly', () async {
-        var hasLooser = await database.scoreDao.hasLooser(
+        var hasLooser = await database.scoreEntryDao.hasLooser(
           matchId: testMatch1.id,
         );
         expect(hasLooser, false);
 
-        await database.scoreDao.setLooser(
+        await database.scoreEntryDao.setLooser(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
         );
 
-        hasLooser = await database.scoreDao.hasLooser(matchId: testMatch1.id);
+        hasLooser = await database.scoreEntryDao.hasLooser(
+          matchId: testMatch1.id,
+        );
         expect(hasLooser, true);
       });
 
       test('getLooser() returns correct winner', () async {
-        var looser = await database.scoreDao.getLooser(matchId: testMatch1.id);
+        var looser = await database.scoreEntryDao.getLooser(
+          matchId: testMatch1.id,
+        );
         expect(looser, isNull);
 
-        await database.scoreDao.setLooser(
+        await database.scoreEntryDao.setLooser(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
         );
 
-        looser = await database.scoreDao.getLooser(matchId: testMatch1.id);
+        looser = await database.scoreEntryDao.getLooser(matchId: testMatch1.id);
 
         expect(looser, isNotNull);
         expect(looser!.id, testPlayer1.id);
       });
 
       test('removeLooser() works correctly', () async {
-        var removed = await database.scoreDao.removeLooser(
+        var removed = await database.scoreEntryDao.removeLooser(
           matchId: testMatch1.id,
         );
         expect(removed, false);
 
-        await database.scoreDao.setLooser(
+        await database.scoreEntryDao.setLooser(
           playerId: testPlayer1.id,
           matchId: testMatch1.id,
         );
 
-        removed = await database.scoreDao.removeLooser(matchId: testMatch1.id);
+        removed = await database.scoreEntryDao.removeLooser(
+          matchId: testMatch1.id,
+        );
         expect(removed, true);
 
-        var looser = await database.scoreDao.getLooser(matchId: testMatch1.id);
+        var looser = await database.scoreEntryDao.getLooser(
+          matchId: testMatch1.id,
+        );
         expect(looser, isNull);
       });
     });