Revert to 4bd2f97

This reverts commit 24f49e17b9, reversing
changes made to dba6c218d6.

# Conflicts:
#	pubspec.yaml

.gitea/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Erstelle eine Meldung für etwas, das nicht Funktioniert, wie es soll.
-title: ''
-labels: 'Task/Bug'
-assignees: ''
-
----
-
-# Bug Report  
-
-## Beschreibung
-[Eine klare und prägnante Beschreibung des Bugs]  
-
-## Schritte zur Reproduktion
-1. Schritt 1  
-2. Schritt 2  
-3. ...  
-
-## Erwartetes Verhalten
-[Was hätte passieren sollen]  
-
-## Tatsächliches Verhalten
-[Was tatsächlich passiert ist]   
-
-## Screenshots/Protokolle
-[Falls zutreffend, füge Screenshots, Error Logs oder Stack Traces hinzu]   
-
-## Umgebung
-- Plattform: Android, iOS, Web
-- OS: [z. B. iOS 18.5, Android 14]  
-- Flutter Version: [z.B. 3.35.6]
-
-## Verwandte Issues
-[Verweisen Sie auf ähnliche Issues oder PRs]

.gitea/ISSUE_TEMPLATE/ENHANCEMENT.md

@@ -1,22 +0,0 @@
----
-name: Enhancement
-about: Enhancements for current features
-title: ''
-labels: 'Task\Enhancement'
-assignees: ''
-
----
-
-# Enhancement  
-
-## Aktuelles Verhalten
-[Beschreibe die bestehende Funktionalität]  
-
-## Einschränkungen/Probleme 
-[Was sind die aktuellen Mängel?]  
-
-## Vorgeschlagene Verbesserung  
-[Wie kann das Problem bzw. die Einschränkung verbessert werden?]  
-
-## Zugehörige Issues
-[Links zu verwandten oder blockierenden Issues]

.gitea/ISSUE_TEMPLATE/FEATURE.md

@@ -1,19 +0,0 @@
----
-name: Feature
-about: Neues Feature für die App
-title: ''
-labels: 'Task\Feature'
-assignees: ''
-
----
-
-# Feature  
-
-## Beschreibung
-[Ausführliche Erläuterung der vorgeschlagenen Funktion]  
-
-## Vorgeschlagene Lösung
-[Beschreibe, wie die Feature funktionieren soll]  
-
-## Zugehörige Issues
-[Links zu verwandten oder blockierenden Issues]

.gitea/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +0,0 @@
-# [PR Titel]
-
-**Zugehörige Issue(s):**  
-Closes `<issue-no>`
-
-## Beschreibung  
-*Eine klare und prägnante Übersicht über die vorgenommenen Änderungen. Erläutere nicht nur das was gemacht wurde, sondern auch warum.*
-
-## Änderungen  
-- [ ] Neue Funktion X hinzugefügt
-- [ ] Bug in Komponente Y behoben
-- [ ] Modul Z für bessere Leistung refactored
-- [ ] Dependencies aktualisiert
-
-## Zusätzliche Anmerkungen  
-*Gibt es zusätzlichen Kontext, Einschränkungen oder Informationen, die Reviewer wissen sollten?*  

.gitea/issue_template/bug.yaml

@@ -0,0 +1,53 @@
+name: Bug Report
+about: Erstelle eine Bug Report
+labels: 'Task/Bug'
+title: ''
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Beschreibung
+      description: Beschreibe klar und pregnant das Fehlerverhalten
+      placeholder: |
+        - Was genau ist das unerwünschte Verhalten?
+        - Welche Auswirkungen hat der Fehler?
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Schritte zur Reproduktion
+      description: Beschreibe, wie der Fehler reproduziert werden kann
+      placeholder: |
+        - 1. Schritt 1  
+        - 2. Schritt 2  
+        - 3. ...
+
+  - type: dropdown
+    id: enviroment
+    attributes:
+      label: Umgebung
+      description: Gebe an, auf welchen Platformen dieser Fehler auftritt
+      list: false
+      multiple: true
+      options: ['Android', 'iOS']
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Lösungsidee
+      description: Beschreibe, wie das Problem bzw. gelöst werden kann
+      placeholder: |
+        - Button X ändern, sodass ...
+        - Funktion X so erweitern, dass ...
+        - Design anpassen, sodass ...
+
+  - type: textarea
+    attributes:
+      label: Verwandte Issues
+      description: Verweise auf ähnliche Issues oder PRs
+      placeholder: |
+        - Knüpft an Issue #35 an
+        - Ersetzt Issue #12
+        - Brauch Implementierung von #43

.gitea/issue_template/enhancement.yaml

@@ -0,0 +1,36 @@
+name: Enhancement
+about: Erstelle ein Enhancement-Ticket
+labels: 'Task/Enhancement'
+title: ''
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Aktuelles Verhalten
+      description: Beschreibe, wie die Funktionalität aktuell gestaltet ist
+      placeholder: |
+        - Aktuell macht Button X folgendes ...
+        - Das Problem ist, dass ...
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Vorgeschlagene Verbesserung
+      description: Beschreibe, wie das Problem bzw. die Einschränkung verbessert werden kann
+      placeholder: |
+        - Button X ändern, sodass ...
+        - Funktion X so erweitern, dass ...
+        - Design anpassen, sodass ...
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Zugehörige Issues
+      description: Links zu verwandten oder blockierenden Issues
+      placeholder: |
+        - Knüpft an Issue #35 an
+        - Ersetzt Issue #12
+        - Brauch Implementierung von #43

.gitea/issue_template/feature.yaml

@@ -0,0 +1,36 @@
+name: Feature
+about: Erstelle ein Feature-Ticket
+labels: 'Task/Feature'
+title: ''
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Beschreibung
+      description: Ausführliche Erläuterung der vorgeschlagenen Funktion
+      placeholder: |
+        - Welchen Zweck erfüllt das Feature?
+        - Welches Problem löst das Feature?
+        - Wer profitiert davon? 
+        - Warum ist es wichtig?
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Vorgeschlagene Lösung
+      description: Beschreibe, wie das Feature funktionieren soll
+      placeholder: |
+        - Neues Widget, das folgendermaßen aussieht ...
+        - Neue Ansicht, die folgende Inhalte hat
+        - Neue Funktionsweise von Komponente XY
+
+  - type: textarea
+    attributes:
+      label: Zugehörige Issues
+      description: Links zu verwandten oder blockierenden Issues
+      placeholder: |
+        - Knüpft an Issue #35 an
+        - Ersetzt Issue #12
+        - Brauch Implementierung von #43

.gitea/pull_request_template.yaml

@@ -0,0 +1,64 @@
+name: Pull Request
+about: Vorlage für Pull Requests
+title: "WIP: [Name des Issues]"
+
+body:
+  - type: input
+    id: related_issue
+    attributes:
+      label: Zugehörige Issue(s)
+      description: Issues welche mit diesem Pull Request geschlossen werden sollen
+      placeholder: "Closes #123"
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Beschreibung
+      description: |
+        Eine klare und prägnante Zusammenfassung aller vorgenommenen Änderungen.
+      placeholder: |
+        Was wurde geändert?
+    validations:
+      required: true
+
+  - type: textarea
+    id: changes
+    attributes:
+      label: Änderungen
+      description: Liste alle Änderungen detailiert auf, die in diesem Pull Request vorgenommen wurden.
+      placeholder: |
+        - Neue Funktion X hinzugefügt
+        - Bug in Komponente X behoben
+        - Modul X für bessere Leistung refactored
+        - Dependencies aktualisiert
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: PR-Checkliste
+      description: Stelle sicher, dass alle Punkte erfüllt sind, bevor du den Pull Request zum Review freigibst.
+      options:
+        - label: Ich habe für Navigationen den AdaptiveNavigator` verwendet
+          required: false
+        - label: Ich habe alle Strings lokalisiert (de/en)
+          required: false
+        - label: Ich habe die Testdaten aktualisiert oder erweitert
+          required: false
+        - label: Ich habe das JSON-Schema angepasst
+          required: false
+        - label: Ich habe Tests für neue Datenbank/DAO-Funktionen hinzugefügt
+          required: false
+
+  - type: textarea
+    id: additional_notes
+    attributes:
+      label: Zusätzliche Anmerkungen
+      description: |
+        Gibt es zusätzlichen Kontext, Einschränkungen oder Informationen,
+        die Reviewer wissen sollten?
+      placeholder: |
+        - Bekannte Einschränkungen
+        - Offene TODOs
+        - Hinweise für Reviewer

.gitea/workflows/pull_request.yaml

@@ -10,48 +10,83 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      # Required for Flutter action
       - name: Install jq
         run: |
           apt-get update
           apt-get install -y jq 
 
-      - name: Install Flutter (wget)
-        run: |
-          wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-          tar xf flutter_linux_3.38.2-stable.tar.xz
-          # Set Git safe directory for Flutter path
-          git config --global --add safe.directory "$(pwd)/flutter"
-          # Set Flutter path
-          echo "$(pwd)/flutter/bin" >> $GITHUB_PATH
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
 
       - name: Get dependencies
-        run: flutter pub get
+        run: |
+          git config --global --add safe.directory '*'
+          flutter pub get
 
       - name: Analyze Formatting
         run: flutter analyze lib test
 
   test:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/cirruslabs/flutter:stable
+    steps:
+      - name: Install Node
+        run: |
+          apt-get update
+          apt-get install -y nodejs npm
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory '*'
+          flutter pub get
+
+      - name: Run tests
+        run: flutter test
+
+  localizations:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install dependencies
+      # Required for Flutter action
+      - name: Install jq
         run: |
           apt-get update
           apt-get install -y jq 
 
-      - name: Install Flutter (wget)
-        run: |
-          wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-          tar xf flutter_linux_3.38.2-stable.tar.xz
-          # Set Git safe directory for Flutter path
-          git config --global --add safe.directory "$(pwd)/flutter"
-          # Set Flutter path
-          echo "$(pwd)/flutter/bin" >> $GITHUB_PATH
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
 
       - name: Get dependencies
-        run: flutter pub get
+        run: |
+          git config --global --add safe.directory '*'
+          flutter pub get
 
-      - name: Run tests
-        run: flutter test
+      - name: Check for untranslated messages
+        run: |
+          flutter gen-l10n --no-use-deferred-loading
+
+          UNTRANSLATED_FILE=lib/l10n/untranslated_messages.json
+          if [ ! -f "$UNTRANSLATED_FILE" ]; then
+            echo "Expected $UNTRANSLATED_FILE to be generated, but it does not exist."
+            exit 1
+          fi
+
+          CONTENT=$(tr -d '[:space:]' < "$UNTRANSLATED_FILE")
+          if [ "$CONTENT" != "{}" ]; then
+            echo "Found untranslated messages:"
+            cat "$UNTRANSLATED_FILE"
+            exit 1
+          fi
+
+          echo "All messages translated."

.gitea/workflows/push.yaml

@@ -7,44 +7,309 @@ on:
       - "main"
 
 jobs:
-  format:
+
+  test:
     runs-on: ubuntu-latest
-    if: false # Needs bot user
+    container:
+      image: ghcr.io/cirruslabs/flutter:stable
     steps:
+      - name: Install Node
+        run: |
+          apt-get update
+          apt-get install -y nodejs npm
+
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install dependencies
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory '*'
+          flutter pub get
+
+      - name: Run tests
+        run: flutter test
+
+  update_version:
+    runs-on: ubuntu-latest
+    if: gitea.ref == 'refs/heads/development'
+    env:
+      GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+      BRANCH_NAME: ${{ gitea.ref_name }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.BOT_TOKEN }}
+          ref: ${{ gitea.ref_name }}
+
+      - name: Increment version number
+        uses: stikkyapp/update-pubspec-version@v2
+        with:
+          strategy: 'patch'
+          path: './pubspec.yaml'
+
+      - name: Commit version update
+        env:
+          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+        run: |
+          git config --global user.name "Gitea Actions [bot]"
+          git config --global user.email "actions@yannick-weigert.de"
+          git config pull.rebase false
+          git pull origin "$BRANCH_NAME"
+          git add pubspec.yaml
+          git commit -m "Updated version number [skip ci]"
+          git push origin HEAD:$BRANCH_NAME
+
+  generate_licenses:
+    runs-on: ubuntu-latest
+    env:
+      GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+      BRANCH_NAME: ${{ gitea.ref_name }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.BOT_TOKEN }}
+          ref: ${{ gitea.ref_name }}
+
+      # Required for Flutter action
+      - name: Install jq
         run: |
           apt-get update
           apt-get install -y jq 
 
-      - name: Install Flutter (wget)
-        run: |
-          wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-          tar xf flutter_linux_3.38.2-stable.tar.xz
-          # Set Git safe directory for Flutter path
-          git config --global --add safe.directory "$(pwd)/flutter"
-          # Set Flutter path
-          echo "$(pwd)/flutter/bin" >> $GITHUB_PATH
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
 
-      - name: Get & upgrade dependencies
+      - name: Get dependencies
         run: |
+          git config --global --add safe.directory '*'
           flutter pub get
-          flutter pub upgrade --major-versions
 
-      - name: Auto-format
-        run: |
-          dart format lib
-          dart fix --apply lib 
+      - name: Generate oss_licenses.dart
+        run: flutter pub run dart_pubspec_licenses:generate -o lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
 
-        # Needs credentials, push access and the right files need to be staged
-      - name: Commit Changes
+      - name: Commit license update
         run: |
-          git config --global user.name "Gitea Actions"
-          git config --global user.email "actions@gitea.com"
-         git status
-          git add lib/
-          git status
-          git commit -m "Actions: Auto-formatting [skip ci]"
-          git push
+          if [ -n "$(git status --porcelain lib test)" ]; then
+            git config --global user.name "Gitea Actions [bot]"
+            git config --global user.email "actions@yannick-weigert.de"
+            git config pull.rebase false
+            git pull origin "$BRANCH_NAME"
+            git add lib test
+            git commit -m "Updated licenses [skip ci]"
+            git push origin HEAD:$BRANCH_NAME
+          else
+            echo "No changes to commit"
+          fi
+
+  generate_localizations:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Required for Flutter action
+      - name: Install jq
+        run: |
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory '*'
+          flutter pub get
+
+      - name: Generate localizations
+        run: flutter gen-l10n --no-use-deferred-loading
+
+      - name: Check for changes
+        id: check_changes
+        run: |
+          if [ -n "$(git status --porcelain lib/l10n)" ]; then
+            echo "has_changes=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Commit generated localizations
+        if: steps.check_changes.outputs.has_changes == 'true'
+        env:
+          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+          BRANCH_NAME: ${{ gitea.ref_name }}
+        run: |
+          git fetch origin "$BRANCH_NAME"
+          git checkout "$BRANCH_NAME"
+
+          if [ -n "$(git status --porcelain lib test)" ]; then
+            git config --global user.name "Gitea Actions [bot]"
+            git config --global user.email "actions@yannick-weigert.de"
+            git config pull.rebase false
+            git pull origin "$BRANCH_NAME"
+            git add lib/l10n
+            git commit -m "Generated localizations [skip ci]"
+            git push origin "HEAD:$BRANCH_NAME"
+          else
+            echo "No changes to commit"
+          fi
+
+  sort_arb_files:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Required for Flutter action
+      - name: Install jq
+        run: |
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory '*'
+          flutter pub get
+
+      - name: Sort .arb-Files
+        run: |
+          shopt -s nullglob
+          for file in lib/l10n/arb/app_*.arb; do
+            echo "Sorting $file"
+            dart run arb_utils sort "$file"
+          done
+
+      - name: Check for changes
+        id: check_changes
+        run: |
+          if [ -n "$(git status --porcelain lib/l10n/arb)" ]; then
+            echo "has_changes=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Commit sorted .arb-Files
+        if: steps.check_changes.outputs.has_changes == 'true'
+        env:
+          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+          BRANCH_NAME: ${{ gitea.ref_name }}
+        run: |
+          git fetch origin "$BRANCH_NAME"
+          git checkout "$BRANCH_NAME"
+
+          if [ -n "$(git status --porcelain lib/l10n/arb)" ]; then
+            git config --global user.name "Gitea Actions [bot]"
+            git config --global user.email "actions@yannick-weigert.de"
+            git config pull.rebase false
+            git pull origin "$BRANCH_NAME"
+            git add lib/l10n/arb
+            git commit -m "Sort .arb files [skip ci]"
+            git push origin "HEAD:$BRANCH_NAME"
+          else
+            echo "No changes to commit"
+          fi
+
+  format:
+    runs-on: ubuntu-latest
+    needs: [update_version, generate_licenses, generate_localizations, sort_arb_files]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Required for Flutter action
+      - name: Install jq
+        run: |
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory '*'
+          flutter pub get
+
+      - name: Check code format
+        id: check_format
+        continue-on-error: true
+        run: flutter analyze lib test
+
+      - name: Format code
+        if: steps.check_format.outcome == 'failure'
+        env:
+          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+          BRANCH_NAME: ${{ gitea.ref_name }}
+        run: |
+          git fetch origin "$BRANCH_NAME"
+          git checkout "$BRANCH_NAME"
+          
+          dart fix --apply lib
+          dart fix --apply test
+          
+          if [ -n "$(git status --porcelain lib test)" ]; then
+            git config --global user.name "Gitea Actions [bot]"
+            git config --global user.email "actions@yannick-weigert.de"
+            git config pull.rebase false
+            git pull origin "$BRANCH_NAME"
+            git add lib test
+            git commit -m "Auto-format code [skip ci]"
+            git push origin HEAD:$BRANCH_NAME
+          else
+            echo "No changes to commit"
+          fi
+
+      - name: Verify format
+        run: flutter analyze lib test
+
+  build:
+    needs: format
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Java (Temurin 17)
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: '17'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+        with:
+          packages: "platform-tools platforms;android-34 build-tools;34.0.0"
+
+      # Required for Flutter action
+      - name: Install jq
+        run: |
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory '*'
+          flutter pub get
+
+      - name: Build APK
+        run: flutter build apk --release

.gitea/workflows/renovate.yaml

@@ -0,0 +1,35 @@
+name: Renovate
+on:
+  schedule:
+    - cron: '0 12 * * 0'
+  push:
+    branches:
+      - setup/222-actions-&-pr-template-verbessern
+
+jobs:
+  renovate:
+    runs-on: ubuntu-latest
+    container:
+      image: node:20-bookworm
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Upgrade git
+        run: |
+          apt-get update
+          apt-get install -y git
+          git --version
+
+      - name: Run Renovate
+        env:
+          RENOVATE_TOKEN: ${{ secrets.BOT_TOKEN }}
+          RENOVATE_PLATFORM: gitea
+          RENOVATE_ENDPOINT: https://git.yannick-weigert.de
+          RENOVATE_REPOSITORIES: liquid-development/game-tracker
+          RENOVATE_GIT_AUTHOR: "Gitea Actions <actions@yannick-weigert.de>"
+          RENOVATE_CONFIG_FILE: renovate.json
+          LOG_LEVEL: info
+        run: |
+          npm install -g renovate
+          renovate

.gitignore

@@ -3,7 +3,6 @@
 
 # Miscellaneous
 *.class
-*.lock
 *.log
 *.pyc
 *.swp
@@ -79,6 +78,7 @@ unlinked_spec.ds
 local.properties
 
 # iOS/XCode related
+Podfile.lock
 **/ios/**/*.mode1v3
 **/ios/**/*.mode2v3
 **/ios/**/*.moved-aside
@@ -150,25 +150,9 @@ app.*.symbols
 .gclient_previous_custom_vars
 .gclient_previous_sync_commits
 
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.build/
-.buildlog/
-.history
-.svn/
 .swiftpm/
 migrate_working_dir/
 
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
 
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
@@ -176,17 +160,8 @@ migrate_working_dir/
 #.vscode/
 
 # Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.pub-cache/
-.pub/
 /build/
 
-# Symbolication related
-app.*.symbols
 
 # Obfuscation related
 app.*.map.json
@@ -196,3 +171,5 @@ app.*.map.json
 /android/app/profile
 /android/app/release
 /devtools_options.yaml
+
+untranslated_messages.json

CONTRIBUTING.md

@@ -0,0 +1,13 @@
+# Contributing
+
+## Code of Conduct
+
+`<insert link to code of conduct here>`
+
+## Code Style
+
+`<insert styling guidelines here>`
+
+## Repository structure
+
+`<insert folder structure and explanation here>`

LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

README.md

@@ -1,7 +1,63 @@
-# Game Tracker
+<p align="center">
+    <img alt="Tallee Logo" src="/artefacts/app-logo.png" width="200"/>
+    <h2 align="center">Tallee</h2>
+</p>
+<p align="center">
+An open-source app to track card- and board games, manage players & groups and get statistics about your played games.
+</p>
+<p align="center">
+    <a href="https://apps.apple.com/">
+      <img src="https://tools.applemediaservices.com/api/badges/download-on-the-app-store/black/en-US" 
+           alt="Download on the App Store" 
+           height="48"
+      />
+    </a>
+    <a href="https://play.google.com/">
+      <img alt="Get it on Google Play" 
+           title="Google Play" 
+           src="https://raw.githubusercontent.com/pd4d10/git-touch/main/assets/google-play-badge.png" 
+           height="48" 
+      />
+    </a>
+</p>
+
+![Version](https://img.shields.io/badge/App--Version-0.0.1_Alpha-orange)
+![Flutter](https://img.shields.io/badge/Flutter-3.38.6-027DFD?logo=flutter)
+![iOS26](https://img.shields.io/badge/iOS-26-white?logo=apple)
+![Android16](https://img.shields.io/badge/Android-16-3DDC84?logo=android)
+
+## Screenshots
+
+<table align="center" cellspacing="8">
+  <tr>
+    <td><img src="/artefacts/screenshot-1.png" alt="Screenshot 1" width="240" /></td>
+    <td><img src="/artefacts/screenshot-2.png" alt="Screenshot 2" width="240" /></td>
+    <td><img src="/artefacts/screenshot-3.png" alt="Screenshot 3" width="240" /></td>
+    <td><img src="/artefacts/screenshot-4.png" alt="Screenshot 4" width="240" /></td>
+  </tr>
+</table>
+
+## Contributing
+
+Contributions are welcome! If you find a bug or have a feature request, please open an issue on GitHub. If you'd like to
+contribute code, feel free to fork the repository and submit a pull request. For contribution guidelines, please refer
+to [CONTRIBUTING.md](CONTRIBUTING.md).
+
+## License
+
+This project is licensed under the GNU LGPLv3 License. See the [LICENSE](LICENSE) file for details.
+
+## Contributors
+
+<a href="https://github.com/liquiddevelopmentde/game-tracker/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=liquiddevelopmentde/game-tracker" />
+</a>
+
+
+## Credits
+
+Tallee is developed and maintained by [Liquid Development](https://liquid-dev.de). For more information or support regarding Tallee, contact us through our website or [hello@liquid-dev.de](mailto:hello@liquid-dev.de).
+
+![Created by Liquid Development](https://img.shields.io/badge/Created_by-Liquid_Development-027DFD?logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBpZD0iRWJlbmVfMSIgZGF0YS1uYW1lPSJFYmVuZSAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA3MjUuNDggODk3LjMiPgogIDxkZWZzPgogICAgPHN0eWxlPgogICAgICAuY2xzLTEgewogICAgICAgIGZpbGw6ICNmZmY7CiAgICAgIH0KICAgIDwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTcwNS4yNiw3MDEuOTJsNi40LDExLjA4Yy0xLjk1LTMuODEtNC4wOS03LjUxLTYuNC0xMS4wOFoiLz4KICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik02MDIuMzksODk3LjI1aC03LjIxYzEuMi4wMywyLjQuMDUsMy42MS4wNXMyLjQxLS4wMiwzLjYxLS4wNVoiLz4KICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0wLDY5NS4zOGwyLjY4LTQuNjRjLS45MywxLjUyLTEuODIsMy4wNy0yLjY4LDQuNjRaIi8+CiAgPHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNjgyLjU1LDcyMy40NWw2LjA1LDEwLjQ5Yy0xLjc5LTMuNjQtMy44MS03LjE1LTYuMDUtMTAuNDlaIi8+CiAgPHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMzcuNzIsNzMzLjI4bDUuMy05LjE4Yy0xLjk0LDIuOTQtMy43MSw2LjAxLTUuMyw5LjE4WiIvPgogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTcxMS42Niw3MTMuMDFsLTYuNC0xMS4wOC0yMjAuNDYtMzgxLjg0aDBWMTAxLjg0YzIwLjY3LTYuOTgsMzUuNTYtMjYuNTIsMzUuNTYtNDkuNTQsMC0yOC44OC0yMy40MS01Mi4zLTUyLjMtNTIuM2gtMjA5LjQ4Yy0yOC44OCwwLTUyLjMsMjMuNDEtNTIuMyw1Mi4zLDAsMjIuNzEsMTQuNDgsNDIuMDMsMzQuNyw0OS4yNXYyMTguNTRsLS4zMy41OEwxOC44OSw3MDQuNzlsLTIuNjgsNC42NGMtOS45OSwxOC4xMi0xNS42OCwzOC45Ni0xNS42OCw2MS4xMiwwLDY5Ljk3LDU2LjY0LDEyNi43LDEyNi41MSwxMjYuN2g0NzUuMzVjNjguMy0xLjkxLDEyMy4wOS01Ny44OCwxMjMuMDktMTI2LjY0LDAtMjAuNzQtNC45OS00MC4zMi0xMy44Mi01Ny42Wk02MDguNTYsODYyLjUzSDExNy40M2MtNDkuMzcsMC04OS4zOS00MC4wMi04OS4zOS04OS4zOSwwLTE0LjM2LDMuMzktMjcuOTMsOS40MS0zOS45Nmw1LjMtOS4xOCwyMzMuMi00MDMuOTJoLS4wOFYxMDQuNTloMTcuODFjOS40NywwLDE3LjE1LTcuNjgsMTcuMTUtMTcuMTVzLTcuNjgtMTcuMTUtMTcuMTUtMTcuMTVoLTM1LjU5di0uMDJjLTkuNzItLjI2LTE3LjUyLTguMi0xNy41Mi0xNy45OHM3LjgtMTcuNzIsMTcuNTItMTcuOTh2LS4wMmgyMDkuMjZjOS45NCwwLDE4LDguMDYsMTgsMThzLTguMDYsMTgtMTgsMThoLTM0LjQ4Yy05LjQ3LDAtMTcuMTUsNy42OC0xNy4xNSwxNy4xNXM3LjY4LDE3LjE1LDE3LjE1LDE3LjE1aDE3LjA0djIxNS40OWguMDdsMjMyLjgyLDQwMy4yNiw2LjA2LDEwLjVjNS44MiwxMS44Niw5LjA5LDI1LjIsOS4wOSwzOS4zLDAsNDkuMzctNDAuMDIsODkuMzktODkuMzksODkuMzlaIi8+CiAgPHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMzgxLjY4LDU0NS4zOGMtMy4wOCwxLjY4LTYuMTgsMy4zLTkuMzIsNC44NiwzLjA3LTEuNjcsNi4xOC0zLjI5LDkuMzItNC44NloiLz4KICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik01ODMuNDIsNTUxLjE5bC0yMC42Ny0zNS44Yy0xMy42OS0xLjg0LTI3LjY3LTIuNzktNDEuODYtMi43OS0xNy45OSwwLTM1LjYyLDEuNTMtNTIuNzgsNC40Ni0zMC41Niw1LjIxLTU5LjYsMTQuODktODYuNDIsMjguMzMtMy4wOCwxLjY4LTYuMTgsMy4zLTkuMzIsNC44Ni00MS44OCwyMC45OS04OS4xNiwzMi43OS0xMzkuMTksMzIuNzktMzQuODUsMC02OC4zNS01Ljc0LTk5LjYzLTE2LjMxLDAsMCwwLC4wMiwwLC4wMmwtMTYuNTIsMjguNjFjMzcuMDEsMTUuNTMsNzcuNjUsMjQuMTIsMTIwLjMsMjQuMTIsMTcuOTgsMCwzNS42MS0xLjUzLDUyLjc2LTQuNDYsMzIuNzctNS41OSw2My43OC0xNi4zMSw5Mi4yLTMxLjI5Ljg3LS40NiwxLjczLS45MiwyLjYtMS40LDQzLjI5LTIyLjgyLDkyLjYyLTM1Ljc0LDE0NC45Ni0zNS43NCwxOC4yOCwwLDM2LjE4LDEuNTksNTMuNTksNC42MWwtLjAyLS4wMloiLz4KICA8Zz4KICAgIDxjaXJjbGUgY2xhc3M9ImNscy0xIiBjeD0iNTg3LjY0IiBjeT0iODAzLjQiIHI9IjE4Ljk2Ii8+CiAgICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik01MTUuNTIsNzg0LjQzSDEwMy41NWMtMTAuOTIsMC0xOS43Niw4LjQ5LTE5Ljc2LDE4Ljk2czguODUsMTguOTYsMTkuNzYsMTguOTZoNDExLjk3YzEwLjkyLDAsMTkuNzYtOC40OSwxOS43Ni0xOC45NnMtOC44NS0xOC45Ni0xOS43Ni0xOC45NloiLz4KICA8L2c+CiAgPGNpcmNsZSBjbGFzcz0iY2xzLTEiIGN4PSIyODMuMzIiIGN5PSI0NjcuNTkiIHI9IjE4Ljk2Ii8+CiAgPGNpcmNsZSBjbGFzcz0iY2xzLTEiIGN4PSIzMjYuMjMiIGN5PSIzNjYuMjUiIHI9IjE4Ljk2Ii8+CiAgPHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDA2LjU2LDM4NS4yMmMtMjQuMDYsMC00My41NiwxOS41LTQzLjU2LDQzLjU2czE5LjUsNDMuNTYsNDMuNTYsNDMuNTYsNDMuNTYtMTkuNSw0My41Ni00My41Ni0xOS41LTQzLjU2LTQzLjU2LTQzLjU2Wk00MDYuNTYsNDQ3Ljc0Yy0xMC40NywwLTE4Ljk2LTguNDktMTguOTYtMTguOTZzOC40OS0xOC45NiwxOC45Ni0xOC45NiwxOC45Niw4LjQ5LDE4Ljk2LDE4Ljk2LTguNDksMTguOTYtMTguOTYsMTguOTZaIi8+Cjwvc3ZnPg==)
 
-![Version](https://img.shields.io/badge/Version-0.3.0-orange)
-![Flutter](https://img.shields.io/badge/Flutter-3.32.1-blue?logo=flutter)
-![Dart](https://img.shields.io/badge/Dart-3.8.1-blue?logo=dart)
 
-A all-in-one app to track card- and board games, manage players and groups and get statistics about your played games.

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
@@ -10,4 +14,5 @@ linter:
     prefer_const_declarations: true
     prefer_const_literals_to_create_immutables: true
     unnecessary_const: true
-    lines_longer_than_80_chars: false
+    lines_longer_than_80_chars: false
+    constant_identifier_names: false

android/app/build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.game_tracker"
+    namespace = "de.liquid.tallee"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
@@ -21,7 +21,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.example.game_tracker"
+        applicationId = "de.liquid.tallee"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET" />
     <application
-        android:label="game_tracker"
+        android:label="Tallee"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -42,5 +43,14 @@
             <action android:name="android.intent.action.PROCESS_TEXT"/>
             <data android:mimeType="text/plain"/>
         </intent>
+        <!-- Required for url_launcher to open URLs in external browser -->
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="http" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" />
+        </intent>
     </queries>
 </manifest>

android/app/src/main/kotlin/com/example/game_tracker/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.example.game_tracker
+package de.liquid.tallee
 
 import io.flutter.embedding.android.FlutterActivity
 

android/app/src/main/res/values/colors.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="app_icon_background">#E6F1E4</color>
-    <color name="launch_background">#0B0B0B</color>
+    <color name="launch_background">#ef681f</color>
 </resources>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Referenz unbedingt als @color/launch_background (nicht @colors/...) -->
-    <color name="ic_launcher_background">@color/app_icon_background</color>
+    <color name="ic_launcher_background">#EF681F</color>
 </resources>

android/settings.gradle.kts

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.7.3" apply false
+    id("com.android.application") version "8.9.1" apply false
     id("org.jetbrains.kotlin.android") version "2.1.0" apply false
 }
 

assets/schema.json

@@ -15,12 +15,56 @@
           },
           "name": {
             "type": "string"
+          },
+          "description": {
+            "type": "string"
           }
         },
+        "additionalProperties": false,
         "required": [
           "id",
           "createdAt",
-          "name"
+          "name",
+          "description"
+        ]
+      }
+    },
+    "games": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "createdAt": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "ruleset": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "color": {
+            "type": "string"
+          },
+          "icon": {
+            "type": "string"
+          }
+        },
+        "additionalProperties": false,
+        "required": [
+          "id",
+          "createdAt",
+          "name",
+          "ruleset",
+          "description",
+          "color",
+          "icon"
         ]
       }
     },
@@ -38,6 +82,9 @@
           "createdAt": {
             "type": "string"
           },
+          "description": {
+            "type": "string"
+          },
           "memberIds": {
             "type": "array",
             "items": {
@@ -45,10 +92,12 @@
             }
           }
         },
+        "additionalProperties": false,
         "required": [
           "id",
           "name",
           "createdAt",
+          "description",
           "memberIds"
         ]
       }
@@ -67,10 +116,19 @@
           "createdAt": {
             "type": "string"
           },
+          "endedAt": {
+            "type": [
+              "string",
+              "null"
+            ]
+          },
+          "gameId": {
+            "type": "string"
+          },
           "groupId": {
-            "anyOf": [
-              {"type": "string"},
-              {"type": "null"}
+            "type": [
+              "string",
+              "null"
             ]
           },
           "playerIds": {
@@ -79,25 +137,55 @@
               "type": "string"
             }
           },
-          "winnerId": {
-            "anyOf": [
-              {"type": "string"},
-              {"type": "null"}
-            ]
+          "scores": {
+            "type": "object",
+            "additionalProperties": {
+              "oneOf": [
+                {
+                  "type": "null"
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "roundNumber": {
+                      "type": "number"
+                    },
+                    "score": {
+                      "type": "number"
+                    },
+                    "change": {
+                      "type": "number"
+                    }
+                  },
+                  "required": ["roundNumber", "score", "change"],
+                  "additionalProperties": false
+                }
+              ]
+            }
+          },
+          "notes": {
+            "type": "string"
+          },
+          "teams": {
+            "type": ["array", "null"]
           }
         },
+        "additionalProperties": false,
         "required": [
           "id",
           "name",
           "createdAt",
-          "groupId",
-          "playerIds"
+          "gameId",
+          "playerIds",
+          "notes"
         ]
       }
     }
   },
+  "additionalProperties": false,
   "required": [
     "players",
+    "games",
     "groups",
     "matches"
   ]

ios/Flutter/AppFrameworkInfo.plist

@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>13.0</string>
 </dict>
 </plist>

ios/Runner.xcodeproj/project.pbxproj

@@ -16,6 +16,7 @@
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		DDD6907F99188C9B97C6B11F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D622CF241440C10C19C0D397 /* Pods_Runner.framework */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -65,6 +66,7 @@
 		B68CF4A64F0B5E45B43D6900 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		D622CF241440C10C19C0D397 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		E754D1191B3E54E52B6DCC49 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -80,6 +82,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 				DDD6907F99188C9B97C6B11F /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -98,6 +101,7 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
+				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -152,7 +156,6 @@
 				B68CF4A64F0B5E45B43D6900 /* Pods-RunnerTests.release.xcconfig */,
 				E754D1191B3E54E52B6DCC49 /* Pods-RunnerTests.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -188,6 +191,9 @@
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 		97C146ED1CF9000F007C117D /* Runner */ = {
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
@@ -213,6 +219,9 @@
 
 /* Begin PBXProject section */
 		97C146E61CF9000F007C117D /* Project object */ = {
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+			);
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
@@ -478,7 +487,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker;
+				PRODUCT_BUNDLE_IDENTIFIER = de.liquid.tallee;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -661,7 +670,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker;
+				PRODUCT_BUNDLE_IDENTIFIER = de.liquid.tallee;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -684,7 +693,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker;
+				PRODUCT_BUNDLE_IDENTIFIER = de.liquid.tallee;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -726,6 +735,18 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+/* Begin XCLocalSwiftPackageReference section */
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
+/* Begin XCSwiftPackageProductDependency section */
+		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }

ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,59 @@
+{
+  "pins" : [
+    {
+      "identity" : "dkcamera",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKCamera",
+      "state" : {
+        "branch" : "master",
+        "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96"
+      }
+    },
+    {
+      "identity" : "dkimagepickercontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKImagePickerController",
+      "state" : {
+        "branch" : "4.3.9",
+        "revision" : "0bdfeacefa308545adde07bef86e349186335915"
+      }
+    },
+    {
+      "identity" : "dkphotogallery",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKPhotoGallery",
+      "state" : {
+        "branch" : "master",
+        "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
+      }
+    },
+    {
+      "identity" : "sdwebimage",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImage",
+      "state" : {
+        "revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0",
+        "version" : "5.21.7"
+      }
+    },
+    {
+      "identity" : "swiftygif",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kirualex/SwiftyGif.git",
+      "state" : {
+        "revision" : "4430cbc148baa3907651d40562d96325426f409a",
+        "version" : "5.4.5"
+      }
+    },
+    {
+      "identity" : "tocropviewcontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/TimOliver/TOCropViewController",
+      "state" : {
+        "revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e",
+        "version" : "2.8.0"
+      }
+    }
+  ],
+  "version" : 2
+}

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -5,6 +5,24 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Runner.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,67 @@
+{
+  "pins" : [
+    {
+      "identity" : "csqlite",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/simolus3/CSQLite.git",
+      "state" : {
+        "revision" : "1ee46d19a4f451a7aa64ffc64fc99b4748131e62"
+      }
+    },
+    {
+      "identity" : "dkcamera",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKCamera",
+      "state" : {
+        "branch" : "master",
+        "revision" : "5c691d11014b910aff69f960475d70e65d9dcc96"
+      }
+    },
+    {
+      "identity" : "dkimagepickercontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKImagePickerController",
+      "state" : {
+        "branch" : "4.3.9",
+        "revision" : "0bdfeacefa308545adde07bef86e349186335915"
+      }
+    },
+    {
+      "identity" : "dkphotogallery",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zhangao0086/DKPhotoGallery",
+      "state" : {
+        "branch" : "master",
+        "revision" : "311c1bc7a94f1538f82773a79c84374b12a2ef3d"
+      }
+    },
+    {
+      "identity" : "sdwebimage",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/SDWebImage/SDWebImage",
+      "state" : {
+        "revision" : "2de3a496eaf6df9a1312862adcfd54acd73c39c0",
+        "version" : "5.21.7"
+      }
+    },
+    {
+      "identity" : "swiftygif",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kirualex/SwiftyGif.git",
+      "state" : {
+        "revision" : "4430cbc148baa3907651d40562d96325426f409a",
+        "version" : "5.4.5"
+      }
+    },
+    {
+      "identity" : "tocropviewcontroller",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/TimOliver/TOCropViewController",
+      "state" : {
+        "revision" : "d4a6d8100f4b886fdbc8ae399bf144ff3e9afb7e",
+        "version" : "2.8.0"
+      }
+    }
+  ],
+  "version" : 2
+}

ios/Runner/AppDelegate.swift

@@ -2,12 +2,15 @@ import Flutter
 import UIKit
 
 @main
-@objc class AppDelegate: FlutterAppDelegate {
+@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
+  func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
+    GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+  }
 }

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,14 +1 @@
-{
-  "images" : [
-    {
-      "filename" : "icon_x1024.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]}

ios/Runner/Assets.xcassets/LauncherColor.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.043",
-          "green" : "0.043",
-          "red" : "0.043"
+          "blue" : "0.122",
+          "green" : "0.408",
+          "red" : "0.937"
         }
       },
       "idiom" : "universal"

ios/Runner/Assets.xcassets/LauncherIcon.imageset/Contents.json

@@ -1,17 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "icon.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "icon-transparent.png",
+      "idiom" : "universal"
     }
   ],
   "info" : {

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24412" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24405"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24504"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -20,12 +20,19 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Tallee" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m4u-iU-Cmv">
+                                <rect key="frame" x="153" y="747" width="87" height="37"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="Futura-Bold" family="Futura" pointSize="28"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="LauncherIcon" translatesAutoresizingMaskIntoConstraints="NO" id="ygV-Op-Bu5">
                                 <rect key="frame" x="46" y="334" width="301" height="184"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" name="LauncherBackgroundColor"/>
+                        <color key="backgroundColor" name="LauncherColor"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -36,8 +43,8 @@
     <color key="tintColor" red="0.90196078431372551" green="0.94509803921568625" blue="0.89411764705882346" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="LauncherIcon" width="1000" height="1000"/>
-        <namedColor name="LauncherBackgroundColor">
-            <color red="0.90196078431372551" green="0.94509803921568625" blue="0.89411764705882346" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        <namedColor name="LauncherColor">
+            <color red="0.93699997663497925" green="0.40799999237060547" blue="0.12200000137090683" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

ios/Runner/Info.plist

@@ -2,10 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Game Tracker</string>
+	<string>Tallee</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +15,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>game_tracker</string>
+	<string>tallee</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -22,8 +24,36 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>https</string>
+		<string>http</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>flutter</string>
+					<key>UISceneDelegateClassName</key>
+					<string>FlutterSceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -39,9 +69,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 </dict>
 </plist>

l10n.yaml

@@ -2,4 +2,5 @@ arb-dir: lib/l10n/arb
 template-arb-file: app_en.arb
 output-localization-file: app_localizations.dart
 output-dir: lib/l10n/generated
-nullable-getter: false
+nullable-getter: false
+untranslated-messages-file: lib/l10n/untranslated_messages.json

lib/core/adaptive_page_route.dart

@@ -0,0 +1,23 @@
+import 'dart:io';
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+/// Returns a platform-adaptive page route based on the current platform.
+/// - On iOS, it returns a [CupertinoPageRoute].
+/// - On other platforms, it returns a [MaterialPageRoute].
+Route<T> adaptivePageRoute<T>({
+  required Widget Function(BuildContext) builder,
+  bool fullscreenDialog = false,
+}) {
+  if (Platform.isIOS) {
+    return CupertinoPageRoute<T>(
+      builder: builder,
+      fullscreenDialog: fullscreenDialog,
+    );
+  }
+  return MaterialPageRoute<T>(
+    builder: builder,
+    fullscreenDialog: fullscreenDialog,
+  );
+}

lib/core/common.dart

@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+import 'package:fluttericon/rpg_awesome_icons.dart';
+import 'package:tallee/core/enums.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
+import 'package:tallee/l10n/generated/app_localizations.dart';
+
+/// Translates a [Ruleset] enum value to its corresponding localized string.
+String translateRulesetToString(Ruleset ruleset, BuildContext context) {
+  final loc = AppLocalizations.of(context);
+  switch (ruleset) {
+    case Ruleset.highestScore:
+      return loc.highest_score;
+    case Ruleset.lowestScore:
+      return loc.lowest_score;
+    case Ruleset.singleWinner:
+      return loc.single_winner;
+    case Ruleset.singleLoser:
+      return loc.single_loser;
+    case Ruleset.multipleWinners:
+      return loc.multiple_winners;
+    case Ruleset.placement:
+      return loc.placement;
+  }
+}
+
+/// Translates a [AppColor] enum value to its corresponding localized string.
+String translateAppColorToString(AppColor color, BuildContext context) {
+  final loc = AppLocalizations.of(context);
+  switch (color) {
+    case AppColor.red:
+      return loc.color_red;
+    case AppColor.blue:
+      return loc.color_blue;
+    case AppColor.green:
+      return loc.color_green;
+    case AppColor.yellow:
+      return loc.color_yellow;
+    case AppColor.purple:
+      return loc.color_purple;
+    case AppColor.orange:
+      return loc.color_orange;
+    case AppColor.pink:
+      return loc.color_pink;
+    case AppColor.teal:
+      return loc.color_teal;
+  }
+}
+
+/// Returns the [Color] object corresponding to a [AppColor] enum value.
+Color getColorFromAppColor(AppColor color) {
+  switch (color) {
+    case AppColor.red:
+      return Colors.red;
+    case AppColor.blue:
+      return Colors.blue;
+    case AppColor.green:
+      return Colors.green;
+    case AppColor.yellow:
+      return const Color(0xFFF7CA28);
+    case AppColor.purple:
+      return Colors.purple;
+    case AppColor.orange:
+      return const Color(0xFFef681f);
+    case AppColor.pink:
+      return const Color(0xFFE91E63);
+    case AppColor.teal:
+      return const Color(0xFF00BCD4);
+  }
+}
+
+/// Returns [IconData] corresponding to a [Ruleset] enum value.
+IconData getRulesetIcon(Ruleset ruleset) {
+  switch (ruleset) {
+    case Ruleset.highestScore:
+      return Icons.arrow_upward;
+    case Ruleset.lowestScore:
+      return Icons.arrow_downward;
+    case Ruleset.singleWinner:
+      return Icons.emoji_events;
+    case Ruleset.singleLoser:
+      return Icons.sentiment_dissatisfied;
+    case Ruleset.multipleWinners:
+      return Icons.group;
+    case Ruleset.placement:
+      return RpgAwesome.podium;
+  }
+}
+
+/// Counts how many players in the [match] are not part of the group
+///
+/// Returns the text you append after the group name, e.g. " + 5" or an empty
+/// string if there are no extra players
+String getExtraPlayerCount(Match match) {
+  int count = 0;
+
+  if (match.group == null) {
+    return '';
+  }
+
+  final groupMembers = match.group!.members;
+  final players = match.players;
+
+  for (var player in players) {
+    if (!groupMembers.any((member) => member.id == player.id)) {
+      count++;
+    }
+  }
+
+  if (count == 0) {
+    return '';
+  }
+  return ' + ${count.toString()}';
+}
+
+String getNameCountText(Player player) {
+  if (player.nameCount >= 1) {
+    return ' #${player.nameCount}';
+  }
+  return '';
+}
+
+String getPointLabel(AppLocalizations loc, int points) {
+  if (points == 1) {
+    return '$points ${loc.point}';
+  } else {
+    return '$points ${loc.points}';
+  }
+}

lib/core/constants.dart

@@ -1,6 +1,25 @@
+/// Application-wide constants
 class Constants {
   Constants._(); // Private constructor to prevent instantiation
 
   /// Minimum duration of all app skeletons
-  static Duration minimumSkeletonDuration = const Duration(milliseconds: 250);
+  static const Duration MINIMUM_SKELETON_DURATION = Duration(milliseconds: 250);
+
+  /// Maximum length for player names
+  static const int MAX_PLAYER_NAME_LENGTH = 32;
+
+  /// Maximum length for group names
+  static const int MAX_GROUP_NAME_LENGTH = 32;
+
+  /// Maximum length for match names
+  static const int MAX_MATCH_NAME_LENGTH = 32;
+
+  /// Maximum length for game names
+  static const int MAX_GAME_NAME_LENGTH = 32;
+
+  /// Maximum length for team names
+  static const int MAX_TEAM_NAME_LENGTH = 32;
+
+  /// Maximum length for game descriptions
+  static const int MAX_GAME_DESCRIPTION_LENGTH = 256;
 }

lib/core/custom_theme.dart

@@ -1,16 +1,45 @@
 import 'package:flutter/material.dart';
+import 'package:tallee/presentation/widgets/buttons/haptic_back_button.dart';
+import 'package:tallee/presentation/widgets/buttons/haptic_close_button.dart';
 
+/// Theme class that defines colors, border radius, padding, and decorations
 class CustomTheme {
   CustomTheme._(); // Private constructor to prevent instantiation
 
   // ==================== Colors ====================
-  static Color primaryColor = const Color(0xFF7505E4);
-  static Color secondaryColor = const Color(0xFFAFA2FF);
-  static Color backgroundColor = const Color(0xFF0B0B0B);
-  static Color boxColor = const Color(0xFF101010);
-  static Color onBoxColor = const Color(0xFF181818);
-  static Color boxBorder = const Color(0xFF272727);
-  static const Color textColor = Colors.white;
+
+  /// Primary color of the app theme
+  static const Color primaryColor = Color(0xFFef681f);
+
+  /// Secondary color of the app theme
+  static const Color secondaryColor = Color(0xFFf2a981);
+
+  /// Background color of the app theme
+  static const Color backgroundColor = Color(0xFF0B0B0B);
+
+  /// Default color for boxes and containers
+  static const Color boxColor = Color(0xFF101010);
+
+  /// Default border color for boxes and containers
+  static const Color boxBorderColor = Color(0xFF272727);
+
+  /// Color for boxes and containers displayed on boxes
+  static const Color onBoxColor = Color(0xFF181818);
+
+  /// Text color used throughout the app
+  static const Color textColor = Color(0xFFFFFFFF);
+
+  /// Text color used throughout the app
+  static const Color hintColor = Color(0xFF888888);
+
+  /// Background color for the navigation bar
+  static const Color navBarBackgroundColor = Color(0xFF131313);
+
+  /// Selected color for the [NavbarItem]
+  static Color navBarItemSelectedColor = primaryColor.withGreen(100);
+
+  /// Unselected color for the [NavbarItem]
+  static Color navBarItemUnselectedColor = Colors.grey.shade400;
 
   // ==================== Border Radius ====================
   static const double standardBorderRadius = 12.0;
@@ -30,30 +59,53 @@ class CustomTheme {
   // ==================== Decorations ====================
   static BoxDecoration standardBoxDecoration = BoxDecoration(
     color: boxColor,
-    border: Border.all(color: boxBorder),
+    border: Border.all(color: boxBorderColor),
     borderRadius: standardBorderRadiusAll,
   );
 
   static BoxDecoration highlightedBoxDecoration = BoxDecoration(
     color: boxColor,
-    border: Border.all(color: primaryColor),
+    border: Border.all(color: textColor, width: 2),
     borderRadius: standardBorderRadiusAll,
-    boxShadow: [BoxShadow(color: primaryColor.withAlpha(120), blurRadius: 12)],
   );
 
-  // ==================== App Bar Theme ====================
-  static AppBarTheme appBarTheme = AppBarTheme(
+  // ==================== Component Themes ====================
+  static const AppBarTheme appBarTheme = AppBarTheme(
     backgroundColor: backgroundColor,
     foregroundColor: textColor,
     elevation: 0,
     scrolledUnderElevation: 0,
     centerTitle: true,
-    titleTextStyle: const TextStyle(
+    titleTextStyle: TextStyle(
       color: textColor,
       fontSize: 20,
       fontWeight: FontWeight.bold,
       overflow: TextOverflow.ellipsis,
     ),
-    iconTheme: const IconThemeData(color: textColor),
+    iconTheme: IconThemeData(color: textColor),
+  );
+
+  static final ActionIconThemeData actionIconTheme = ActionIconThemeData(
+    backButtonIconBuilder: (context) => const HapticBackButton(),
+    closeButtonIconBuilder: (context) => const HapticCloseButton(),
+  );
+
+  static const SearchBarThemeData searchBarTheme = SearchBarThemeData(
+    textStyle: WidgetStatePropertyAll(TextStyle(color: textColor)),
+    hintStyle: WidgetStatePropertyAll(TextStyle(color: hintColor)),
+  );
+
+  static final RadioThemeData radioTheme = RadioThemeData(
+    fillColor: WidgetStateProperty.resolveWith<Color>((states) {
+      if (states.contains(WidgetState.selected)) {
+        return primaryColor;
+      }
+      return textColor;
+    }),
+  );
+
+  static const InputDecorationTheme inputDecorationTheme = InputDecorationTheme(
+    labelStyle: TextStyle(color: textColor),
+    hintStyle: TextStyle(color: hintColor),
   );
 }

lib/core/enums.dart

@@ -1,6 +1,3 @@
-import 'package:flutter/material.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-
 /// Button types used for styling the [CustomWidthButton]
 /// - [ButtonType.primary]: Primary button style.
 /// - [ButtonType.secondary]: Secondary button style.
@@ -29,24 +26,49 @@ enum ImportResult {
 /// - [ExportResult.unknownException]: An exception occurred during export.
 enum ExportResult { success, canceled, unknownException }
 
-/// Different rulesets available for matches
-/// - [Ruleset.singleWinner]: The match is won by a single player
-/// - [Ruleset.singleLoser]: The match is lost by a single player
-/// - [Ruleset.mostPoints]: The player with the most points wins.
-/// - [Ruleset.leastPoints]: The player with the fewest points wins.
-enum Ruleset { singleWinner, singleLoser, mostPoints, leastPoints }
-
-/// Translates a [Ruleset] enum value to its corresponding localized string.
-String translateRulesetToString(Ruleset ruleset, BuildContext context) {
-  final loc = AppLocalizations.of(context);
-  switch (ruleset) {
-    case Ruleset.singleWinner:
-      return loc.single_winner;
-    case Ruleset.singleLoser:
-      return loc.single_loser;
-    case Ruleset.mostPoints:
-      return loc.most_points;
-    case Ruleset.leastPoints:
-      return loc.least_points;
-  }
+/// Different rulesets available for games
+/// - [Ruleset.highestScore]: The player with the highest score wins.
+/// - [Ruleset.lowestScore]: The player with the lowest score wins.
+/// - [Ruleset.singleWinner]: The match is won by a single player.
+/// - [Ruleset.singleLoser]: The match has a single loser.
+/// - [Ruleset.multipleWinners]: Multiple players can be winners.
+/// - [Ruleset.placement]: The player with the highest placement wins.
+enum Ruleset {
+  singleWinner,
+  multipleWinners,
+  highestScore,
+  lowestScore,
+  placement,
+  singleLoser,
+}
+
+/// Different colors for highlighting games
+enum AppColor { red, orange, yellow, green, teal, blue, purple, pink }
+
+enum StatisticType {
+  totalMatches,
+  totalWins,
+  totalScore,
+  totalLosses,
+  averageScore,
+  bestScore,
+  worstScore,
+  winrate,
+}
+
+enum StatisticScope {
+  allPlayers,
+  //selectedPlayer,
+  selectedGroups,
+  selectedGames,
+  timeframe,
+}
+
+enum Timeframe {
+  last7Days,
+  last30Days,
+  last90Days,
+  last180Days,
+  lastYear,
+  allTime,
 }

lib/data/dao/game_dao.dart

@@ -0,0 +1,218 @@
+import 'package:drift/drift.dart';
+import 'package:tallee/core/enums.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/game_table.dart';
+import 'package:tallee/data/models/game.dart';
+
+part 'game_dao.g.dart';
+
+@DriftAccessor(tables: [GameTable])
+class GameDao extends DatabaseAccessor<AppDatabase> with _$GameDaoMixin {
+  GameDao(super.db);
+
+  /* Create */
+
+  /// Adds a new [game] to the database.
+  /// If a game with the same ID already exists, no action is taken.
+  /// Returns `true` if the game was added, `false` otherwise.
+  Future<bool> addGame({required Game game}) async {
+    if (!await gameExists(gameId: game.id)) {
+      await into(gameTable).insert(
+        GameTableCompanion.insert(
+          id: game.id,
+          name: game.name,
+          ruleset: game.ruleset.name,
+          description: game.description,
+          color: game.color.name,
+          icon: game.icon,
+          createdAt: game.createdAt,
+        ),
+        mode: InsertMode.insertOrReplace,
+      );
+      return true;
+    }
+    return false;
+  }
+
+  /// Adds multiple [games] to the database in a batch operation.
+  /// Uses insertOrIgnore to avoid overwriting existing games.
+  Future<bool> addGamesAsList({required List<Game> games}) async {
+    if (games.isEmpty) return false;
+
+    await db.batch(
+      (b) => b.insertAll(
+        gameTable,
+        games
+            .map(
+              (game) => GameTableCompanion.insert(
+                id: game.id,
+                name: game.name,
+                ruleset: game.ruleset.name,
+                description: game.description,
+                color: game.color.name,
+                icon: game.icon,
+                createdAt: game.createdAt,
+              ),
+            )
+            .toList(),
+        mode: InsertMode.insertOrIgnore,
+      ),
+    );
+
+    return true;
+  }
+
+  /* Read */
+
+  /// Retrieves the total count of games in the database.
+  Future<int> getGameCount() async {
+    final count =
+        await (selectOnly(gameTable)..addColumns([gameTable.id.count()]))
+            .map((row) => row.read(gameTable.id.count()))
+            .getSingle();
+    return count ?? 0;
+  }
+
+  /// Checks if a game with the given [gameId] exists in the database.
+  /// Returns `true` if the game exists, `false` otherwise.
+  Future<bool> gameExists({required String gameId}) async {
+    final query = select(gameTable)..where((g) => g.id.equals(gameId));
+    final row = await query.getSingleOrNull();
+    return row != null;
+  }
+
+  /// Retrieves all games from the database.
+  Future<List<Game>> getAllGames() async {
+    final query = select(gameTable);
+    final result = await query.get();
+    return result
+        .map(
+          (row) => Game(
+            id: row.id,
+            name: row.name,
+            ruleset: Ruleset.values.firstWhere((e) => e.name == row.ruleset),
+            description: row.description,
+            color: AppColor.values.firstWhere((e) => e.name == row.color),
+            icon: row.icon,
+            createdAt: row.createdAt,
+          ),
+        )
+        .toList();
+  }
+
+  /// Retrieves a [Game] by its [gameId].
+  Future<Game> getGameById({required String gameId}) async {
+    final query = select(gameTable)..where((g) => g.id.equals(gameId));
+    final row = await query.getSingle();
+    return Game(
+      id: row.id,
+      name: row.name,
+      ruleset: Ruleset.values.firstWhere((e) => e.name == row.ruleset),
+      description: row.description,
+      color: AppColor.values.firstWhere((e) => e.name == row.color),
+      icon: row.icon,
+      createdAt: row.createdAt,
+    );
+  }
+
+  /* Update */
+
+  /// Updates the name of the game with the given [gameId] to [name].
+  Future<bool> updateGameName({
+    required String gameId,
+    required String name,
+  }) async {
+    final rowsAffected =
+        await (update(gameTable)..where((tbl) => tbl.id.equals(gameId))).write(
+          GameTableCompanion(name: Value(name)),
+        );
+    return rowsAffected > 0;
+  }
+
+  /// Updates the ruleset of the game with the given [gameId].
+  Future<bool> updateGameRuleset({
+    required String gameId,
+    required Ruleset ruleset,
+  }) async {
+    final rowsAffected =
+        await (update(gameTable)..where((tbl) => tbl.id.equals(gameId))).write(
+          GameTableCompanion(ruleset: Value(ruleset.name)),
+        );
+    return rowsAffected > 0;
+  }
+
+  /// Updates the description of the game with the given [gameId].
+  Future<bool> updateGameDescription({
+    required String gameId,
+    required String description,
+  }) async {
+    final rowsAffected =
+        await (update(gameTable)..where((tbl) => tbl.id.equals(gameId))).write(
+          GameTableCompanion(description: Value(description)),
+        );
+    return rowsAffected > 0;
+  }
+
+  /// Updates the color of the game with the given [gameId].
+  Future<bool> updateGameColor({
+    required String gameId,
+    required AppColor color,
+  }) async {
+    final rowsAffected =
+        await (update(gameTable)..where((tbl) => tbl.id.equals(gameId))).write(
+          GameTableCompanion(color: Value(color.name)),
+        );
+    return rowsAffected > 0;
+  }
+
+  /// Updates the icon of the game with the given [gameId].
+  Future<bool> updateGameIcon({
+    required String gameId,
+    required String icon,
+  }) async {
+    final rowsAffected =
+        await (update(gameTable)..where((tbl) => tbl.id.equals(gameId))).write(
+          GameTableCompanion(icon: Value(icon)),
+        );
+    return rowsAffected > 0;
+  }
+
+  /* Delete */
+
+  /// Deletes the game with the given [gameId] from the database.
+  /// Returns `true` if the game was deleted, `false` if the game did not exist.
+  Future<bool> deleteGame({required String gameId}) async {
+    final query = delete(gameTable)..where((tbl) => tbl.id.equals(gameId));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  /// Deletes all games from the database.
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> deleteAllGames() async {
+    final query = delete(gameTable);
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  /// Retrieves all games with their respective match counts.
+  /// Returns a list of tuples (Game, matchCount).
+  Future<List<(Game, int)>> getGameUsage() async {
+    final games = await getAllGames();
+
+    final results = <(Game, int)>[];
+
+    for (final game in games) {
+      final matchCount =
+          await (selectOnly(db.matchTable)
+                ..where(db.matchTable.gameId.equals(game.id))
+                ..addColumns([db.matchTable.id.count()]))
+              .map((row) => row.read(db.matchTable.id.count()))
+              .getSingle();
+
+      results.add((game, matchCount ?? 0));
+    }
+
+    return results;
+  }
+}

lib/data/dao/game_dao.g.dart

@@ -0,0 +1,16 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'game_dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$GameDaoMixin on DatabaseAccessor<AppDatabase> {
+  $GameTableTable get gameTable => attachedDatabase.gameTable;
+  GameDaoManager get managers => GameDaoManager(this);
+}
+
+class GameDaoManager {
+  final _$GameDaoMixin _db;
+  GameDaoManager(this._db);
+  $$GameTableTableTableManager get gameTable =>
+      $$GameTableTableTableManager(_db.attachedDatabase, _db.gameTable);
+}

lib/data/dao/group_dao.dart

@@ -1,51 +1,18 @@
 import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/group_table.dart';
-import 'package:game_tracker/data/db/tables/player_group_table.dart';
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/group_table.dart';
+import 'package:tallee/data/db/tables/match_table.dart';
+import 'package:tallee/data/db/tables/player_group_table.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/player.dart';
 
 part 'group_dao.g.dart';
 
-@DriftAccessor(tables: [GroupTable, PlayerGroupTable])
+@DriftAccessor(tables: [GroupTable, PlayerGroupTable, MatchTable])
 class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
   GroupDao(super.db);
 
-  /// Retrieves all groups from the database.
-  Future<List<Group>> getAllGroups() async {
-    final query = select(groupTable);
-    final result = await query.get();
-    return Future.wait(
-      result.map((groupData) async {
-        final members = await db.playerGroupDao.getPlayersOfGroup(
-          groupId: groupData.id,
-        );
-        return Group(
-          id: groupData.id,
-          name: groupData.name,
-          members: members,
-          createdAt: groupData.createdAt,
-        );
-      }),
-    );
-  }
-
-  /// Retrieves a [Group] by its [groupId], including its members.
-  Future<Group> getGroupById({required String groupId}) async {
-    final query = select(groupTable)..where((g) => g.id.equals(groupId));
-    final result = await query.getSingle();
-
-    List<Player> members = await db.playerGroupDao.getPlayersOfGroup(
-      groupId: groupId,
-    );
-
-    return Group(
-      id: result.id,
-      name: result.name,
-      members: members,
-      createdAt: result.createdAt,
-    );
-  }
+  /* Create */
 
   /// Adds a new group with the given [id] and [name] to the database.
   /// This method also adds the group's members to the [PlayerGroupTable].
@@ -56,6 +23,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
           GroupTableCompanion.insert(
             id: group.id,
             name: group.name,
+            description: group.description,
             createdAt: group.createdAt,
           ),
           mode: InsertMode.insertOrReplace,
@@ -105,6 +73,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
                 (group) => GroupTableCompanion.insert(
                   id: group.id,
                   name: group.name,
+                  description: group.description,
                   createdAt: group.createdAt,
                 ),
               )
@@ -132,6 +101,7 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
                   (p) => PlayerTableCompanion.insert(
                     id: p.id,
                     name: p.name,
+                    description: p.description,
                     createdAt: p.createdAt,
                   ),
                 )
@@ -166,42 +136,103 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
     });
   }
 
-  /// Deletes the group with the given [id] from the database.
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> deleteGroup({required String groupId}) async {
-    final query = (delete(groupTable)..where((g) => g.id.equals(groupId)));
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
+  /* Read */
+
+  /// Retrieves all groups from the database.
+  Future<List<Group>> getAllGroups() async {
+    final query = select(groupTable);
+    final result = await query.get();
+    return Future.wait(
+      result.map((row) async {
+        final members = await db.playerGroupDao.getPlayersOfGroup(
+          groupId: row.id,
+        );
+        return Group(
+          id: row.id,
+          name: row.name,
+          description: row.description,
+          members: members,
+          createdAt: row.createdAt,
+        );
+      }),
+    );
   }
 
-  /// Updates the name of the group with the given [id] to [newName].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateGroupname({
-    required String groupId,
-    required String newName,
-  }) async {
-    final rowsAffected =
-        await (update(groupTable)..where((g) => g.id.equals(groupId))).write(
-          GroupTableCompanion(name: Value(newName)),
-        );
-    return rowsAffected > 0;
+  /// Retrieves a [Group] by its [groupId], including its members.
+  Future<Group> getGroupById({required String groupId}) async {
+    final query = select(groupTable)..where((g) => g.id.equals(groupId));
+    final row = await query.getSingle();
+
+    List<Player> members = await db.playerGroupDao.getPlayersOfGroup(
+      groupId: groupId,
+    );
+
+    return Group(
+      id: row.id,
+      name: row.name,
+      description: row.description,
+      members: members,
+      createdAt: row.createdAt,
+    );
   }
 
   /// Retrieves the number of groups in the database.
   Future<int> getGroupCount() async {
     final count =
         await (selectOnly(groupTable)..addColumns([groupTable.id.count()]))
-            .map((row) => row.read(groupTable.id.count()))
+            .map((tbl) => tbl.read(groupTable.id.count()))
             .getSingle();
     return count ?? 0;
   }
 
+  /// Retrieves all groups a specific player belongs to.
+  /// Returns an empty list if the player is not part of any group.
+  Future<List<Group>> getGroupsByPlayer({required String playerId}) async {
+    final playerGroups = await (select(
+      playerGroupTable,
+    )..where((tbl) => tbl.playerId.equals(playerId))).get();
+
+    if (playerGroups.isEmpty) return [];
+
+    final groupIds = playerGroups.map((pg) => pg.groupId).toSet().toList();
+    final result =
+        await (select(groupTable)
+              ..where((tbl) => tbl.id.isIn(groupIds))
+              ..orderBy([(tbl) => OrderingTerm.desc(tbl.createdAt)]))
+            .get();
+
+    return Future.wait(
+      result.map((row) async {
+        final members = await db.playerGroupDao.getPlayersOfGroup(
+          groupId: row.id,
+        );
+        return Group(
+          id: row.id,
+          name: row.name,
+          description: row.description,
+          members: members,
+          createdAt: row.createdAt,
+        );
+      }),
+    );
+  }
+
   /// Checks if a group with the given [groupId] exists in the database.
   /// Returns `true` if the group exists, `false` otherwise.
   Future<bool> groupExists({required String groupId}) async {
     final query = select(groupTable)..where((g) => g.id.equals(groupId));
-    final result = await query.getSingleOrNull();
-    return result != null;
+    final row = await query.getSingleOrNull();
+    return row != null;
+  }
+
+  /* Delete */
+
+  /// Deletes the group with the given [id] from the database.
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> deleteGroup({required String groupId}) async {
+    final query = (delete(groupTable)..where((g) => g.id.equals(groupId)));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
   }
 
   /// Deletes all groups from the database.
@@ -211,4 +242,30 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
     final rowsAffected = await query.go();
     return rowsAffected > 0;
   }
+
+  /* Update */
+
+  /// Updates the name of the group with the given [id] to [name].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updateGroupName({
+    required String groupId,
+    required String name,
+  }) async {
+    final rowsAffected =
+        await (update(groupTable)..where((tbl) => tbl.id.equals(groupId)))
+            .write(GroupTableCompanion(name: Value(name)));
+    return rowsAffected > 0;
+  }
+
+  /// Updates the description of the group with the given [groupId] to [description].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updateGroupDescription({
+    required String groupId,
+    required String description,
+  }) async {
+    final rowsAffected =
+        await (update(groupTable)..where((tbl) => tbl.id.equals(groupId)))
+            .write(GroupTableCompanion(description: Value(description)));
+    return rowsAffected > 0;
+  }
 }

lib/data/dao/group_dao.g.dart

@@ -8,4 +8,25 @@ mixin _$GroupDaoMixin on DatabaseAccessor<AppDatabase> {
   $PlayerTableTable get playerTable => attachedDatabase.playerTable;
   $PlayerGroupTableTable get playerGroupTable =>
       attachedDatabase.playerGroupTable;
+  $GameTableTable get gameTable => attachedDatabase.gameTable;
+  $MatchTableTable get matchTable => attachedDatabase.matchTable;
+  GroupDaoManager get managers => GroupDaoManager(this);
+}
+
+class GroupDaoManager {
+  final _$GroupDaoMixin _db;
+  GroupDaoManager(this._db);
+  $$GroupTableTableTableManager get groupTable =>
+      $$GroupTableTableTableManager(_db.attachedDatabase, _db.groupTable);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
+  $$PlayerGroupTableTableTableManager get playerGroupTable =>
+      $$PlayerGroupTableTableTableManager(
+        _db.attachedDatabase,
+        _db.playerGroupTable,
+      );
+  $$GameTableTableTableManager get gameTable =>
+      $$GameTableTableTableManager(_db.attachedDatabase, _db.gameTable);
+  $$MatchTableTableTableManager get matchTable =>
+      $$MatchTableTableTableManager(_db.attachedDatabase, _db.matchTable);
 }

lib/data/dao/group_match_dao.dart

@@ -1,98 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/group_match_table.dart';
-import 'package:game_tracker/data/dto/group.dart';
-
-part 'group_match_dao.g.dart';
-
-@DriftAccessor(tables: [GroupMatchTable])
-class GroupMatchDao extends DatabaseAccessor<AppDatabase>
-    with _$GroupMatchDaoMixin {
-  GroupMatchDao(super.db);
-
-  /// Associates a group with a match by inserting a record into the
-  /// [GroupMatchTable].
-  Future<void> addGroupToMatch({
-    required String matchId,
-    required String groupId,
-  }) async {
-    if (await matchHasGroup(matchId: matchId)) {
-      throw Exception('Match already has a group');
-    }
-    await into(groupMatchTable).insert(
-      GroupMatchTableCompanion.insert(groupId: groupId, matchId: matchId),
-      mode: InsertMode.insertOrIgnore,
-    );
-  }
-
-  /// Retrieves the [Group] associated with the given [matchId].
-  /// Returns `null` if no group is found.
-  Future<Group?> getGroupOfMatch({required String matchId}) async {
-    final result = await (select(
-      groupMatchTable,
-    )..where((g) => g.matchId.equals(matchId))).getSingleOrNull();
-
-    if (result == null) {
-      return null;
-    }
-
-    final group = await db.groupDao.getGroupById(groupId: result.groupId);
-    return group;
-  }
-
-  /// Checks if there is a group associated with the given [matchId].
-  /// Returns `true` if there is a group, otherwise `false`.
-  Future<bool> matchHasGroup({required String matchId}) async {
-    final count =
-        await (selectOnly(groupMatchTable)
-              ..where(groupMatchTable.matchId.equals(matchId))
-              ..addColumns([groupMatchTable.groupId.count()]))
-            .map((row) => row.read(groupMatchTable.groupId.count()))
-            .getSingle();
-    return (count ?? 0) > 0;
-  }
-
-  /// Checks if a specific group is associated with a specific match.
-  /// Returns `true` if the group is in the match, otherwise `false`.
-  Future<bool> isGroupInMatch({
-    required String matchId,
-    required String groupId,
-  }) async {
-    final count =
-        await (selectOnly(groupMatchTable)
-              ..where(
-                groupMatchTable.matchId.equals(matchId) &
-                    groupMatchTable.groupId.equals(groupId),
-              )
-              ..addColumns([groupMatchTable.groupId.count()]))
-            .map((row) => row.read(groupMatchTable.groupId.count()))
-            .getSingle();
-    return (count ?? 0) > 0;
-  }
-
-  /// Removes the association of a group from a match based on [groupId] and
-  /// [matchId].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> removeGroupFromMatch({
-    required String matchId,
-    required String groupId,
-  }) async {
-    final query = delete(groupMatchTable)
-      ..where((g) => g.matchId.equals(matchId) & g.groupId.equals(groupId));
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
-  }
-
-  /// Updates the group associated with a match to [newGroupId] based on
-  /// [matchId].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateGroupOfMatch({
-    required String matchId,
-    required String newGroupId,
-  }) async {
-    final updatedRows =
-        await (update(groupMatchTable)..where((g) => g.matchId.equals(matchId)))
-            .write(GroupMatchTableCompanion(groupId: Value(newGroupId)));
-    return updatedRows > 0;
-  }
-}

lib/data/dao/group_match_dao.g.dart

@@ -1,10 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'group_match_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$GroupMatchDaoMixin on DatabaseAccessor<AppDatabase> {
-  $GroupTableTable get groupTable => attachedDatabase.groupTable;
-  $MatchTableTable get matchTable => attachedDatabase.matchTable;
-  $GroupMatchTableTable get groupMatchTable => attachedDatabase.groupMatchTable;
-}

lib/data/dao/match_dao.dart

@@ -1,87 +1,60 @@
 import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/match_table.dart';
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/data/dto/match.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/game_table.dart';
+import 'package:tallee/data/db/tables/group_table.dart';
+import 'package:tallee/data/db/tables/match_table.dart';
+import 'package:tallee/data/db/tables/player_match_table.dart';
+import 'package:tallee/data/models/game.dart';
+import 'package:tallee/data/models/group.dart';
+import 'package:tallee/data/models/match.dart';
+import 'package:tallee/data/models/player.dart';
+import 'package:tallee/data/models/team.dart';
 
 part 'match_dao.g.dart';
 
-@DriftAccessor(tables: [MatchTable])
+@DriftAccessor(tables: [MatchTable, GameTable, GroupTable, PlayerMatchTable])
 class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
   MatchDao(super.db);
 
-  /// Retrieves all matches from the database.
-  Future<List<Match>> getAllMatches() async {
-    final query = select(matchTable);
-    final result = await query.get();
+  /* Create */
 
-    return Future.wait(
-      result.map((row) async {
-        final group = await db.groupMatchDao.getGroupOfMatch(matchId: row.id);
-        final players = await db.playerMatchDao.getPlayersOfMatch(
-          matchId: row.id,
-        );
-        final winner = row.winnerId != null
-            ? await db.playerDao.getPlayerById(playerId: row.winnerId!)
-            : null;
-        return Match(
-          id: row.id,
-          name: row.name,
-          group: group,
-          players: players,
-          createdAt: row.createdAt,
-          winner: winner,
-        );
-      }),
-    );
-  }
-
-  /// Retrieves a [Match] by its [matchId].
-  Future<Match> getMatchById({required String matchId}) async {
-    final query = select(matchTable)..where((g) => g.id.equals(matchId));
-    final result = await query.getSingle();
-
-    List<Player>? players;
-    if (await db.playerMatchDao.matchHasPlayers(matchId: matchId)) {
-      players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId);
-    }
-    Group? group;
-    if (await db.groupMatchDao.matchHasGroup(matchId: matchId)) {
-      group = await db.groupMatchDao.getGroupOfMatch(matchId: matchId);
-    }
-    Player? winner;
-    if (result.winnerId != null) {
-      winner = await db.playerDao.getPlayerById(playerId: result.winnerId!);
-    }
-
-    return Match(
-      id: result.id,
-      name: result.name,
-      players: players,
-      group: group,
-      winner: winner,
-      createdAt: result.createdAt,
-    );
-  }
-
-  /// Adds a new [Match] to the database. Also adds players and group
-  /// associations. This method assumes that the players and groups added to
-  /// this match are already present in the database.
-  Future<void> addMatch({required Match match}) async {
+  /// Adds a new [Match] to the database. Also adds players associations and teams.
+  /// This method assumes that the game and group (if any) are already present
+  /// in the database.
+  Future<bool> addMatch({required Match match}) async {
+    if (await matchExists(matchId: match.id)) return false;
     await db.transaction(() async {
       await into(matchTable).insert(
         MatchTableCompanion.insert(
           id: match.id,
+          gameId: match.game.id,
+          groupId: Value(match.group?.id),
           name: match.name,
-          winnerId: Value(match.winner?.id),
+          notes: match.notes,
           createdAt: match.createdAt,
+          endedAt: Value(match.endedAt),
         ),
         mode: InsertMode.insertOrReplace,
       );
 
-      if (match.players != null) {
-        for (final p in match.players ?? []) {
+      // Add teams
+      if (match.teams != null && match.teams!.isNotEmpty) {
+        await db.teamDao.addTeamsAsList(teams: match.teams!, matchId: match.id);
+      }
+
+      // Collect all player IDs that are already in teams
+      final playersInTeams = <String>{};
+      if (match.teams != null) {
+        for (final team in match.teams!) {
+          for (final member in team.members) {
+            playersInTeams.add(member.id);
+          }
+        }
+      }
+
+      // Add players that are not in teams
+      for (final p in match.players) {
+        if (!playersInTeams.contains(p.id)) {
           await db.playerMatchDao.addPlayerToMatch(
             matchId: match.id,
             playerId: p.id,
@@ -89,53 +62,68 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         }
       }
 
-      if (match.group != null) {
-        await db.groupMatchDao.addGroupToMatch(
-          matchId: match.id,
-          groupId: match.group!.id,
-        );
+      for (final pid in match.scores.keys) {
+        final playerScores = match.scores[pid];
+        if (playerScores != null) {
+          await db.scoreEntryDao.addScore(
+            entry: playerScores,
+            playerId: pid,
+            matchId: match.id,
+          );
+        }
       }
     });
+    return true;
   }
 
-  /// Adds multiple [Match]s to the database in a batch operation.
+  /// Adds multiple [Match]es to the database in a batch operation.
   /// Also adds associated players and groups if they exist.
   /// If the [matches] list is empty, the method returns immediately.
-  /// This Method should only be used to import matches from a different device.
-  Future<void> addMatchAsList({required List<Match> matches}) async {
-    if (matches.isEmpty) return;
+  /// This method should only be used to import matches from a different device.
+  Future<bool> addMatchesAsList({required List<Match> matches}) async {
+    if (matches.isEmpty) return false;
     await db.transaction(() async {
-      // Add all matches in batch
-      await db.batch(
-        (b) => b.insertAll(
-          matchTable,
-          matches
-              .map(
-                (match) => MatchTableCompanion.insert(
-                  id: match.id,
-                  name: match.name,
-                  createdAt: match.createdAt,
-                  winnerId: Value(match.winner?.id),
-                ),
-              )
-              .toList(),
-          mode: InsertMode.insertOrReplace,
-        ),
-      );
+      // Add all games first (deduplicated)
+      final uniqueGames = <String, Game>{};
+      for (final match in matches) {
+        uniqueGames[match.game.id] = match.game;
+      }
 
-      // Add all groups of the matches in batch
-      // Using insertOrIgnore to avoid overwriting existing groups (which would
-      // trigger cascade deletes on player_group associations)
+      // Add games
+      if (uniqueGames.isNotEmpty) {
+        await db.batch(
+          (b) => b.insertAll(
+            db.gameTable,
+            uniqueGames.values
+                .map(
+                  (game) => GameTableCompanion.insert(
+                    id: game.id,
+                    name: game.name,
+                    ruleset: game.ruleset.name,
+                    description: game.description,
+                    color: game.color.name,
+                    icon: game.icon,
+                    createdAt: game.createdAt,
+                  ),
+                )
+                .toList(),
+            mode: InsertMode.insertOrIgnore,
+          ),
+        );
+      }
+
+      // Add groups
       await db.batch(
         (b) => b.insertAll(
           db.groupTable,
           matches
               .where((match) => match.group != null)
               .map(
-                (matches) => GroupTableCompanion.insert(
-                  id: matches.group!.id,
-                  name: matches.group!.name,
-                  createdAt: matches.group!.createdAt,
+                (match) => GroupTableCompanion.insert(
+                  id: match.group!.id,
+                  name: match.group!.name,
+                  description: match.group!.description,
+                  createdAt: match.group!.createdAt,
                 ),
               )
               .toList(),
@@ -143,13 +131,32 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         ),
       );
 
-      // Add all players of the matches in batch (unique)
+      // Add matches
+      await db.batch(
+        (b) => b.insertAll(
+          matchTable,
+          matches
+              .map(
+                (match) => MatchTableCompanion.insert(
+                  id: match.id,
+                  gameId: match.game.id,
+                  groupId: Value(match.group?.id),
+                  name: match.name,
+                  notes: match.notes,
+                  createdAt: match.createdAt,
+                  endedAt: Value(match.endedAt),
+                ),
+              )
+              .toList(),
+          mode: InsertMode.insertOrReplace,
+        ),
+      );
+
+      // Add players
       final uniquePlayers = <String, Player>{};
       for (final match in matches) {
-        if (match.players != null) {
-          for (final p in match.players!) {
-            uniquePlayers[p.id] = p;
-          }
+        for (final p in match.players) {
+          uniquePlayers[p.id] = p;
         }
         // Also include members of groups
         if (match.group != null) {
@@ -160,8 +167,6 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
       }
 
       if (uniquePlayers.isNotEmpty) {
-        // Using insertOrIgnore to avoid triggering cascade deletes on
-        // player_group/player_match associations when players already exist
         await db.batch(
           (b) => b.insertAll(
             db.playerTable,
@@ -170,6 +175,7 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
                   (p) => PlayerTableCompanion.insert(
                     id: p.id,
                     name: p.name,
+                    description: p.description,
                     createdAt: p.createdAt,
                   ),
                 )
@@ -179,25 +185,43 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         );
       }
 
-      // Add all player-match associations in batch
       await db.batch((b) {
         for (final match in matches) {
-          if (match.players != null) {
-            for (final p in match.players ?? []) {
+          for (final entry in match.scores.entries) {
+            if (entry.value != null) {
               b.insert(
-                db.playerMatchTable,
-                PlayerMatchTableCompanion.insert(
+                db.scoreEntryTable,
+                ScoreEntryTableCompanion.insert(
                   matchId: match.id,
-                  playerId: p.id,
+                  playerId: entry.key,
+                  score: entry.value!.score,
+                  roundNumber: entry.value!.roundNumber,
+                  change: entry.value!.change,
                 ),
-                mode: InsertMode.insertOrIgnore,
+                mode: InsertMode.insertOrReplace,
               );
             }
           }
         }
       });
 
-      // Add all player-group associations in batch
+      // Add player-match associations
+      await db.batch((b) {
+        for (final match in matches) {
+          for (final p in match.players) {
+            b.insert(
+              db.playerMatchTable,
+              PlayerMatchTableCompanion.insert(
+                matchId: match.id,
+                playerId: p.id,
+              ),
+              mode: InsertMode.insertOrIgnore,
+            );
+          }
+        }
+      });
+
+      // Add player-group associations
       await db.batch((b) {
         for (final match in matches) {
           if (match.group != null) {
@@ -215,47 +239,297 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
         }
       });
 
-      // Add all group-match associations in batch
-      await db.batch((b) {
-        for (final match in matches) {
-          if (match.group != null) {
-            b.insert(
-              db.groupMatchTable,
-              GroupMatchTableCompanion.insert(
-                matchId: match.id,
-                groupId: match.group!.id,
-              ),
-              mode: InsertMode.insertOrIgnore,
-            );
-          }
+      // Add teams for matches
+      for (final match in matches) {
+        if (match.teams != null && match.teams!.isNotEmpty) {
+          await db.teamDao.addTeamsAsList(
+            teams: match.teams!,
+            matchId: match.id,
+          );
         }
-      });
+      }
     });
+    return true;
   }
 
-  /// Deletes the match with the given [matchId] from the database.
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> deleteMatch({required String matchId}) async {
-    final query = delete(matchTable)..where((g) => g.id.equals(matchId));
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
+  /* Read */
+
+  /// Checks if a match with the given [matchId] exists in the database.
+  /// Returns `true` if the match exists, otherwise `false`.
+  Future<bool> matchExists({required String matchId}) async {
+    final query = select(matchTable)..where((g) => g.id.equals(matchId));
+    final row = await query.getSingleOrNull();
+    return row != null;
   }
 
   /// Retrieves the number of matches in the database.
   Future<int> getMatchCount() async {
     final count =
         await (selectOnly(matchTable)..addColumns([matchTable.id.count()]))
-            .map((row) => row.read(matchTable.id.count()))
+            .map((tbl) => tbl.read(matchTable.id.count()))
             .getSingle();
     return count ?? 0;
   }
 
-  /// Checks if a match with the given [matchId] exists in the database.
-  /// Returns `true` if the match exists, otherwise `false`.
-  Future<bool> matchExists({required String matchId}) async {
+  /// Retrieves all matches from the database.
+  Future<List<Match>> getAllMatches() async {
+    final query = select(matchTable);
+    final result = await query.get();
+
+    return Future.wait(
+      result.map((row) async {
+        final game = await db.gameDao.getGameById(gameId: row.gameId);
+
+        Group? group;
+        if (row.groupId != null) {
+          group = await db.groupDao.getGroupById(groupId: row.groupId!);
+        }
+
+        final players = await db.playerMatchDao.getPlayersOfMatch(
+          matchId: row.id,
+        );
+
+        final scores = await db.scoreEntryDao.getAllMatchScores(
+          matchId: row.id,
+        );
+
+        final teams = await _getMatchTeams(matchId: row.id);
+
+        return Match(
+          id: row.id,
+          name: row.name,
+          game: game,
+          group: group,
+          players: players,
+          teams: teams.isEmpty ? null : teams,
+          notes: row.notes,
+          createdAt: row.createdAt,
+          endedAt: row.endedAt,
+          scores: scores,
+        );
+      }),
+    );
+  }
+
+  /// Retrieves a [Match] by its [matchId].
+  Future<Match> getMatchById({required String matchId}) async {
     final query = select(matchTable)..where((g) => g.id.equals(matchId));
-    final result = await query.getSingleOrNull();
-    return result != null;
+    final row = await query.getSingle();
+
+    final game = await db.gameDao.getGameById(gameId: row.gameId);
+
+    Group? group;
+    if (row.groupId != null) {
+      group = await db.groupDao.getGroupById(groupId: row.groupId!);
+    }
+
+    final players = await db.playerMatchDao.getPlayersOfMatch(matchId: matchId);
+
+    final scores = await db.scoreEntryDao.getAllMatchScores(matchId: matchId);
+
+    final teams = await _getMatchTeams(matchId: matchId);
+
+    return Match(
+      id: row.id,
+      name: row.name,
+      game: game,
+      group: group,
+      players: players,
+      teams: teams.isEmpty ? null : teams,
+      notes: row.notes,
+      createdAt: row.createdAt,
+      endedAt: row.endedAt,
+      scores: scores,
+    );
+  }
+
+  /// Retrieves the number of matches associated with a specific game.
+  Future<int> getMatchCountByGame({required String gameId}) async {
+    final count =
+        await (selectOnly(matchTable)
+              ..where(matchTable.gameId.equals(gameId))
+              ..addColumns([matchTable.id.count()]))
+            .map((tbl) => tbl.read(matchTable.id.count()))
+            .getSingle();
+    return count ?? 0;
+  }
+
+  Future<List<Match>> getMatchesByPlayer({required String playerId}) async {
+    final playerMatches = await (select(
+      playerMatchTable,
+    )..where((tbl) => tbl.playerId.equals(playerId))).get();
+
+    if (playerMatches.isEmpty) return [];
+
+    final matchIds = playerMatches.map((tbl) => tbl.matchId).toSet().toList();
+    final result =
+        await (select(matchTable)
+              ..where((tbl) => tbl.id.isIn(matchIds))
+              ..orderBy([(tbl) => OrderingTerm.desc(tbl.createdAt)]))
+            .get();
+
+    return Future.wait(
+      result.map((row) async {
+        final game = await db.gameDao.getGameById(gameId: row.gameId);
+
+        Group? group;
+        if (row.groupId != null) {
+          group = await db.groupDao.getGroupById(groupId: row.groupId!);
+        }
+
+        final players = await db.playerMatchDao.getPlayersOfMatch(
+          matchId: row.id,
+        );
+        final scores = await db.scoreEntryDao.getAllMatchScores(
+          matchId: row.id,
+        );
+        final teams = await _getMatchTeams(matchId: row.id);
+
+        return Match(
+          id: row.id,
+          name: row.name,
+          game: game,
+          group: group,
+          players: players,
+          teams: teams.isEmpty ? null : teams,
+          notes: row.notes,
+          createdAt: row.createdAt,
+          endedAt: row.endedAt,
+          scores: scores,
+        );
+      }),
+    );
+  }
+
+  /// Retrieves all matches associated with the given [groupId].
+  /// Queries the database directly, filtering by [groupId].
+  Future<List<Match>> getMatchesByGroup({required String groupId}) async {
+    final query = select(matchTable)..where((m) => m.groupId.equals(groupId));
+    final result = await query.get();
+
+    return Future.wait(
+      result.map((row) async {
+        final game = await db.gameDao.getGameById(gameId: row.gameId);
+        final group = await db.groupDao.getGroupById(groupId: groupId);
+        final players = await db.playerMatchDao.getPlayersOfMatch(
+          matchId: row.id,
+        );
+        final teams = await _getMatchTeams(matchId: row.id);
+
+        return Match(
+          id: row.id,
+          name: row.name,
+          game: game,
+          group: group,
+          players: players,
+          teams: teams.isEmpty ? null : teams,
+          notes: row.notes,
+          createdAt: row.createdAt,
+          endedAt: row.endedAt,
+        );
+      }),
+    );
+  }
+
+  /// Helper method to retrieve teams for a specific match
+  Future<List<Team>> _getMatchTeams({required String matchId}) async {
+    // Get all unique team IDs from PlayerMatchTable for this match
+    final playerMatchQuery = select(db.playerMatchTable)
+      ..where((tbl) => tbl.matchId.equals(matchId) & tbl.teamId.isNotNull());
+    final playerMatches = await playerMatchQuery.get();
+
+    if (playerMatches.isEmpty) return [];
+
+    final teamIds = playerMatches
+        .map((pm) => pm.teamId)
+        .whereType<String>()
+        .toSet()
+        .toList();
+
+    // Fetch all teams
+    final teams = await Future.wait(
+      teamIds.map((teamId) => db.teamDao.getTeamById(teamId: teamId)),
+    );
+
+    return teams;
+  }
+
+  /* Update */
+
+  /// Changes the name of the match with the given [matchId] to [name].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updateMatchName({
+    required String matchId,
+    required String name,
+  }) async {
+    final query = update(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final rowsAffected = await query.write(
+      MatchTableCompanion(name: Value(name)),
+    );
+    return rowsAffected > 0;
+  }
+
+  /// Updates the group of the match with the given [matchId].
+  /// Replaces the existing group association with the new group specified by [groupId].
+  /// Pass null to remove the group association.
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updateMatchGroup({
+    required String matchId,
+    required String? groupId,
+  }) async {
+    final query = update(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final rowsAffected = await query.write(
+      MatchTableCompanion(groupId: Value(groupId)),
+    );
+    return rowsAffected > 0;
+  }
+
+  /// Updates the notes of the match with the given [matchId].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updateMatchNotes({
+    required String matchId,
+    required String notes,
+  }) async {
+    final query = update(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final rowsAffected = await query.write(
+      MatchTableCompanion(notes: Value(notes)),
+    );
+    return rowsAffected > 0;
+  }
+
+  /// Removes the group association of the match with the given [matchId].
+  /// Sets the groupId to null.
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> removeMatchGroup({required String matchId}) async {
+    final query = update(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final rowsAffected = await query.write(
+      const MatchTableCompanion(groupId: Value(null)),
+    );
+    return rowsAffected > 0;
+  }
+
+  /// Updates the endedAt timestamp of the match with the given [matchId].
+  /// Pass null to remove the ended time (mark match as ongoing).
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updateMatchEndedAt({
+    required String matchId,
+    required DateTime endedAt,
+  }) async {
+    final query = update(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final rowsAffected = await query.write(
+      MatchTableCompanion(endedAt: Value(endedAt)),
+    );
+    return rowsAffected > 0;
+  }
+
+  /* Delete */
+
+  /// Deletes the match with the given [matchId] from the database.
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> deleteMatch({required String matchId}) async {
+    final query = delete(matchTable)..where((tbl) => tbl.id.equals(matchId));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
   }
 
   /// Deletes all matches from the database.
@@ -266,61 +540,11 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     return rowsAffected > 0;
   }
 
-  /// Sets the winner of the match with the given [matchId] to the player with
-  /// the given [winnerId].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> setWinner({
-    required String matchId,
-    required String winnerId,
-  }) async {
-    final query = update(matchTable)..where((g) => g.id.equals(matchId));
-    final rowsAffected = await query.write(
-      MatchTableCompanion(winnerId: Value(winnerId)),
-    );
-    return rowsAffected > 0;
-  }
-
-  /// Retrieves the winner of the match with the given [matchId].
-  /// Returns the [Player] who won the match, or `null` if no winner is set.
-  Future<Player?> getWinner({required String matchId}) async {
-    final query = select(matchTable)..where((g) => g.id.equals(matchId));
-    final result = await query.getSingleOrNull();
-    if (result == null || result.winnerId == null) {
-      return null;
-    }
-    final winner = await db.playerDao.getPlayerById(playerId: result.winnerId!);
-    return winner;
-  }
-
-  /// Removes the winner of the match with the given [matchId].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> removeWinner({required String matchId}) async {
-    final query = update(matchTable)..where((g) => g.id.equals(matchId));
-    final rowsAffected = await query.write(
-      const MatchTableCompanion(winnerId: Value(null)),
-    );
-    return rowsAffected > 0;
-  }
-
-  /// Checks if the match with the given [matchId] has a winner set.
-  /// Returns `true` if a winner is set, otherwise `false`.
-  Future<bool> hasWinner({required String matchId}) async {
-    final query = select(matchTable)
-      ..where((g) => g.id.equals(matchId) & g.winnerId.isNotNull());
-    final result = await query.getSingleOrNull();
-    return result != null;
-  }
-
-  /// Changes the title of the match with the given [matchId] to [newName].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> updateMatchName({
-    required String matchId,
-    required String newName,
-  }) async {
-    final query = update(matchTable)..where((g) => g.id.equals(matchId));
-    final rowsAffected = await query.write(
-      MatchTableCompanion(name: Value(newName)),
-    );
-    return rowsAffected > 0;
+  /// Deletes all matches associated with a specific game.
+  /// Returns the number of matches deleted.
+  Future<int> deleteMatchesByGame({required String gameId}) async {
+    final query = delete(matchTable)..where((tbl) => tbl.gameId.equals(gameId));
+    final rowsAffected = await query.go();
+    return rowsAffected;
   }
 }

lib/data/dao/match_dao.g.dart

@@ -4,5 +4,32 @@ part of 'match_dao.dart';
 
 // ignore_for_file: type=lint
 mixin _$MatchDaoMixin on DatabaseAccessor<AppDatabase> {
+  $GameTableTable get gameTable => attachedDatabase.gameTable;
+  $GroupTableTable get groupTable => attachedDatabase.groupTable;
   $MatchTableTable get matchTable => attachedDatabase.matchTable;
+  $PlayerTableTable get playerTable => attachedDatabase.playerTable;
+  $TeamTableTable get teamTable => attachedDatabase.teamTable;
+  $PlayerMatchTableTable get playerMatchTable =>
+      attachedDatabase.playerMatchTable;
+  MatchDaoManager get managers => MatchDaoManager(this);
+}
+
+class MatchDaoManager {
+  final _$MatchDaoMixin _db;
+  MatchDaoManager(this._db);
+  $$GameTableTableTableManager get gameTable =>
+      $$GameTableTableTableManager(_db.attachedDatabase, _db.gameTable);
+  $$GroupTableTableTableManager get groupTable =>
+      $$GroupTableTableTableManager(_db.attachedDatabase, _db.groupTable);
+  $$MatchTableTableTableManager get matchTable =>
+      $$MatchTableTableTableManager(_db.attachedDatabase, _db.matchTable);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
+  $$TeamTableTableTableManager get teamTable =>
+      $$TeamTableTableTableManager(_db.attachedDatabase, _db.teamTable);
+  $$PlayerMatchTableTableTableManager get playerMatchTable =>
+      $$PlayerMatchTableTableTableManager(
+        _db.attachedDatabase,
+        _db.playerMatchTable,
+      );
 }

lib/data/dao/player_dao.dart

@@ -1,7 +1,8 @@
 import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/player_table.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/player_table.dart';
+import 'package:tallee/data/models/player.dart';
 
 part 'player_dao.g.dart';
 
@@ -9,38 +10,22 @@ part 'player_dao.g.dart';
 class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
   PlayerDao(super.db);
 
-  /// Retrieves all players from the database.
-  Future<List<Player>> getAllPlayers() async {
-    final query = select(playerTable);
-    final result = await query.get();
-    return result
-        .map(
-          (row) => Player(id: row.id, name: row.name, createdAt: row.createdAt),
-        )
-        .toList();
-  }
-
-  /// Retrieves a [Player] by their [id].
-  Future<Player> getPlayerById({required String playerId}) async {
-    final query = select(playerTable)..where((p) => p.id.equals(playerId));
-    final result = await query.getSingle();
-    return Player(
-      id: result.id,
-      name: result.name,
-      createdAt: result.createdAt,
-    );
-  }
+  /* Create */
 
   /// Adds a new [player] to the database.
   /// If a player with the same ID already exists, updates their name to
   /// the new one.
   Future<bool> addPlayer({required Player player}) async {
     if (!await playerExists(playerId: player.id)) {
+      final int nameCount = await _processNameCount(name: player.name);
+
       await into(playerTable).insert(
         PlayerTableCompanion.insert(
           id: player.id,
           name: player.name,
+          description: player.description,
           createdAt: player.createdAt,
+          nameCount: Value(nameCount),
         ),
         mode: InsertMode.insertOrReplace,
       );
@@ -55,60 +40,294 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
   Future<bool> addPlayersAsList({required List<Player> players}) async {
     if (players.isEmpty) return false;
 
+    // Filter out players that already exist
+    final newPlayers = <Player>[];
+    for (final player in players) {
+      if (!await playerExists(playerId: player.id)) {
+        newPlayers.add(player);
+      }
+    }
+
+    if (newPlayers.isEmpty) return false;
+
+    // Group players by name
+    final nameGroups = <String, List<Player>>{};
+    for (final player in newPlayers) {
+      nameGroups.putIfAbsent(player.name, () => []).add(player);
+    }
+
+    final playersToInsert = <PlayerTableCompanion>[];
+
+    // Process each group of players with the same name
+    for (final entry in nameGroups.entries) {
+      final name = entry.key;
+      final playersWithName = entry.value;
+
+      // Get the current nameCount
+      var nameCount = await _processNameCount(name: name);
+
+      // One player with the same name
+      if (playersWithName.length == 1) {
+        final player = playersWithName[0];
+        playersToInsert.add(
+          PlayerTableCompanion.insert(
+            id: player.id,
+            name: player.name,
+            description: player.description,
+            createdAt: player.createdAt,
+            nameCount: Value(nameCount),
+          ),
+        );
+      } else {
+        if (nameCount == 0) nameCount++;
+        // Multiple players with the same name
+        for (var i = 0; i < playersWithName.length; i++) {
+          final player = playersWithName[i];
+          playersToInsert.add(
+            PlayerTableCompanion.insert(
+              id: player.id,
+              name: player.name,
+              description: player.description,
+              createdAt: player.createdAt,
+              nameCount: Value(nameCount + i),
+            ),
+          );
+        }
+      }
+    }
+
     await db.batch(
       (b) => b.insertAll(
         playerTable,
-        players
-            .map(
-              (player) => PlayerTableCompanion.insert(
-                id: player.id,
-                name: player.name,
-                createdAt: player.createdAt,
-              ),
-            )
-            .toList(),
-        mode: InsertMode.insertOrIgnore,
+        playersToInsert,
+        mode: InsertMode.insertOrReplace,
       ),
     );
 
     return true;
   }
 
-  /// Deletes the player with the given [id] from the database.
-  /// Returns `true` if the player was deleted, `false` if the player did not exist.
-  Future<bool> deletePlayer({required String playerId}) async {
-    final query = delete(playerTable)..where((p) => p.id.equals(playerId));
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
-  }
-
-  /// Checks if a player with the given [id] exists in the database.
-  /// Returns `true` if the player exists, `false` otherwise.
-  Future<bool> playerExists({required String playerId}) async {
-    final query = select(playerTable)..where((p) => p.id.equals(playerId));
-    final result = await query.getSingleOrNull();
-    return result != null;
-  }
-
-  /// Updates the name of the player with the given [playerId] to [newName].
-  Future<void> updatePlayername({
-    required String playerId,
-    required String newName,
-  }) async {
-    await (update(playerTable)..where((p) => p.id.equals(playerId))).write(
-      PlayerTableCompanion(name: Value(newName)),
-    );
-  }
+  /* Read */
 
   /// Retrieves the total count of players in the database.
   Future<int> getPlayerCount() async {
     final count =
         await (selectOnly(playerTable)..addColumns([playerTable.id.count()]))
-            .map((row) => row.read(playerTable.id.count()))
+            .map((tbl) => tbl.read(playerTable.id.count()))
             .getSingle();
     return count ?? 0;
   }
 
+  /// Checks if a player with the given [playerId] exists in the database.
+  /// Returns `true` if the player exists, `false` otherwise.
+  Future<bool> playerExists({required String playerId}) async {
+    final query = select(playerTable)..where((p) => p.id.equals(playerId));
+    final row = await query.getSingleOrNull();
+    return row != null;
+  }
+
+  /// Retrieves all players from the database.
+  Future<List<Player>> getAllPlayers() async {
+    final query = select(playerTable);
+    final result = await query.get();
+    return result
+        .map(
+          (row) => Player(
+            id: row.id,
+            name: row.name,
+            description: row.description,
+            createdAt: row.createdAt,
+            nameCount: row.nameCount,
+          ),
+        )
+        .toList();
+  }
+
+  /// Retrieves a [Player] by their [id].
+  Future<Player> getPlayerById({required String playerId}) async {
+    final query = select(playerTable)..where((p) => p.id.equals(playerId));
+    final row = await query.getSingle();
+    return Player(
+      id: row.id,
+      name: row.name,
+      description: row.description,
+      createdAt: row.createdAt,
+      nameCount: row.nameCount,
+    );
+  }
+
+  /* Update */
+
+  /// Updates the name of the player with the given [playerId] to [name].
+  ///
+  /// Keeps the `nameCount` values of the affected name groups consistent:
+  /// - The renamed player gets a fresh `nameCount` for the new name group.
+  /// - All players in the previous name group whose `nameCount` was greater
+  ///   than the removed one get decremented by 1, so the numbering stays
+  ///   contiguous (1..N) in `createdAt` order.
+  /// - If only one player remains in the previous name group, their
+  ///   `nameCount` is reset to 0.
+  Future<bool> updatePlayerName({
+    required String playerId,
+    required String name,
+  }) async {
+    return transaction(() async {
+      final previousPlayer = await (select(
+        playerTable,
+      )..where((tbl) => tbl.id.equals(playerId))).getSingleOrNull();
+      if (previousPlayer == null) return false;
+
+      final previousName = previousPlayer.name;
+      final previousCount = previousPlayer.nameCount;
+
+      // Determine the nameCount for the renamed player in the new group.
+      final newNameCount = await _processNameCount(name: name);
+
+      final rowsAffected =
+          await (update(
+            playerTable,
+          )..where((tbl) => tbl.id.equals(playerId))).write(
+            PlayerTableCompanion(
+              name: Value(name),
+              nameCount: Value(newNameCount),
+            ),
+          );
+
+      // Consolidate the previous name group.
+      final remainingCount = await getNameCount(name: previousName);
+
+      if (remainingCount == 1) {
+        // Only one player left
+        await (update(playerTable)..where((p) => p.name.equals(previousName)))
+            .write(const PlayerTableCompanion(nameCount: Value(0)));
+      } else if (remainingCount > 1 && previousCount > 0) {
+        // Shift every player above the gap down by one to keep numbering in order.
+        await (update(playerTable)..where(
+              (tbl) =>
+                  tbl.name.equals(previousName) &
+                  tbl.nameCount.isBiggerThanValue(previousCount),
+            ))
+            .write(
+              PlayerTableCompanion.custom(
+                nameCount: playerTable.nameCount - const Constant(1),
+              ),
+            );
+      }
+
+      return rowsAffected > 0;
+    });
+  }
+
+  /// Updates the description of the player with the given [playerId] to
+  /// [description].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updatePlayerDescription({
+    required String playerId,
+    required String description,
+  }) async {
+    final rowsAffected =
+        await (update(playerTable)..where((tbl) => tbl.id.equals(playerId)))
+            .write(PlayerTableCompanion(description: Value(description)));
+    return rowsAffected > 0;
+  }
+
+  /* Delete */
+
+  /// Deletes the player with the given [id] from the database.
+  /// Returns `true` if the player was deleted, `false` if the player did not exist.
+  Future<bool> deletePlayer({required String playerId}) async {
+    final query = delete(playerTable)..where((tbl) => tbl.id.equals(playerId));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  /* Name count management */
+
+  /// Retrieves the count of players with the given [name].
+  /// Returns the highest name count if players with the same name exist,
+  /// otherwise `null`.
+  Future<int> getNameCount({required String name}) async {
+    final query = select(playerTable)..where((tbl) => tbl.name.equals(name));
+    final result = await query.get();
+    return result.length;
+  }
+
+  /// Updates the nameCount for the player with the given [playerId] to [nameCount].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> updateNameCount({
+    required String playerId,
+    required int nameCount,
+  }) async {
+    final query = update(playerTable)..where((tbl) => tbl.id.equals(playerId));
+    final rowsAffected = await query.write(
+      PlayerTableCompanion(nameCount: Value(nameCount)),
+    );
+    return rowsAffected > 0;
+  }
+
+  @visibleForTesting
+  Future<Player?> getPlayerWithHighestNameCount({required String name}) async {
+    final query = select(playerTable)
+      ..where((tbl) => tbl.name.equals(name))
+      ..orderBy([(tbl) => OrderingTerm.desc(tbl.nameCount)])
+      ..limit(1);
+    final result = await query.getSingleOrNull();
+    if (result != null) {
+      return Player(
+        id: result.id,
+        name: result.name,
+        description: result.description,
+        createdAt: result.createdAt,
+        nameCount: result.nameCount,
+      );
+    }
+    return null;
+  }
+
+  /// Processes the name count for a new player with the given [name].
+  ///- 0 Player: returning 0
+  ///- 1 Player: returning 2, and initializes the nameCount for the existing player to 1
+  ///- Other: returning the existing count + 1
+  Future<int> _processNameCount({required String name}) async {
+    final nameCount = await calculateNameCount(name: name);
+    if (nameCount == 2) {
+      // If one other player exists with the same name, initialize the nameCount
+      await initializeNameCount(name: name);
+    }
+    return nameCount;
+  }
+
+  @visibleForTesting
+  /// Calculates the name count for a new player with the given [name].
+  /// - 0 Players: Name count is 0
+  /// - 1 Player: Name count is 2 (since the existing player will be 1)
+  /// - Other: Name count is the existing count + 1
+  Future<int> calculateNameCount({required String name}) async {
+    final count = await getNameCount(name: name);
+    final int nameCount;
+
+    if (count == 0) {
+      // If no other players exist with the same name, the returned nameCount is 0
+      nameCount = 0;
+    } else if (count == 1) {
+      // If one other player with the name count exists, the returned name count is 2
+      nameCount = 2;
+    } else {
+      // If more than one player exists with the same name, just increment
+      // the nameCount for the new player
+      nameCount = count + 1;
+    }
+    return nameCount;
+  }
+
+  @visibleForTesting
+  Future<bool> initializeNameCount({required String name}) async {
+    final rowsAffected =
+        await (update(playerTable)..where((tbl) => tbl.name.equals(name)))
+            .write(const PlayerTableCompanion(nameCount: Value(1)));
+    return rowsAffected > 0;
+  }
+
   /// Deletes all players from the database.
   /// Returns `true` if more than 0 rows were affected, otherwise `false`.
   Future<bool> deleteAllPlayers() async {

lib/data/dao/player_dao.g.dart

@@ -5,4 +5,12 @@ part of 'player_dao.dart';
 // ignore_for_file: type=lint
 mixin _$PlayerDaoMixin on DatabaseAccessor<AppDatabase> {
   $PlayerTableTable get playerTable => attachedDatabase.playerTable;
+  PlayerDaoManager get managers => PlayerDaoManager(this);
+}
+
+class PlayerDaoManager {
+  final _$PlayerDaoMixin _db;
+  PlayerDaoManager(this._db);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
 }

lib/data/dao/player_group_dao.dart

@@ -1,8 +1,8 @@
 import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/player_group_table.dart';
-import 'package:game_tracker/data/db/tables/player_table.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/player_group_table.dart';
+import 'package:tallee/data/db/tables/player_table.dart';
+import 'package:tallee/data/models/player.dart';
 
 part 'player_group_dao.g.dart';
 
@@ -11,8 +11,7 @@ class PlayerGroupDao extends DatabaseAccessor<AppDatabase>
     with _$PlayerGroupDaoMixin {
   PlayerGroupDao(super.db);
 
-  /// No need for a groupHasPlayers method since the members attribute is
-  /// not nullable
+  /* Create */
 
   /// Adds a [player] to a group with the given [groupId].
   /// If the player is already in the group, no action is taken.
@@ -27,42 +26,38 @@ class PlayerGroupDao extends DatabaseAccessor<AppDatabase>
     }
 
     if (!await db.playerDao.playerExists(playerId: player.id)) {
-      db.playerDao.addPlayer(player: player);
+      await db.playerDao.addPlayer(player: player);
     }
 
     await into(playerGroupTable).insert(
       PlayerGroupTableCompanion.insert(playerId: player.id, groupId: groupId),
     );
-
     return true;
   }
 
+  /* Read */
+
   /// Retrieves all players belonging to a specific group by [groupId].
   Future<List<Player>> getPlayersOfGroup({required String groupId}) async {
-    final query = select(playerGroupTable)
-      ..where((pG) => pG.groupId.equals(groupId));
-    final result = await query.get();
+    final query = select(playerGroupTable).join([
+      innerJoin(
+        playerTable,
+        playerTable.id.equalsExp(playerGroupTable.playerId),
+      ),
+    ])..where(playerGroupTable.groupId.equals(groupId));
 
-    List<Player> groupMembers = List.empty(growable: true);
-
-    for (var entry in result) {
-      final player = await db.playerDao.getPlayerById(playerId: entry.playerId);
-      groupMembers.add(player);
-    }
-
-    return groupMembers;
-  }
-
-  /// Removes a player from a group based on [playerId] and [groupId].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> removePlayerFromGroup({
-    required String playerId,
-    required String groupId,
-  }) async {
-    final query = delete(playerGroupTable)
-      ..where((p) => p.playerId.equals(playerId) & p.groupId.equals(groupId));
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
+    final result = await query.map((row) => row.readTable(playerTable)).get();
+    return result
+        .map(
+          (row) => Player(
+            id: row.id,
+            createdAt: row.createdAt,
+            name: row.name,
+            nameCount: row.nameCount,
+            description: row.description,
+          ),
+        )
+        .toList();
   }
 
   /// Checks if a player with [playerId] is in the group with [groupId].
@@ -72,8 +67,73 @@ class PlayerGroupDao extends DatabaseAccessor<AppDatabase>
     required String groupId,
   }) async {
     final query = select(playerGroupTable)
-      ..where((p) => p.playerId.equals(playerId) & p.groupId.equals(groupId));
+      ..where(
+        (tbl) => tbl.playerId.equals(playerId) & tbl.groupId.equals(groupId),
+      );
     final result = await query.getSingleOrNull();
     return result != null;
   }
+
+  /* Update */
+
+  /// Replaces all players in a group with the provided list of players.
+  /// Removes all existing players from the group and adds the new players.
+  /// Also adds any new players to the player table if they don't exist.
+  /// Returns `true` if the group exists and players were replaced, `false` otherwise.
+  Future<bool> replaceGroupPlayers({
+    required String groupId,
+    required List<Player> newPlayers,
+  }) async {
+    if (!await db.groupDao.groupExists(groupId: groupId)) return false;
+    if (newPlayers.isEmpty) return false;
+
+    await db.transaction(() async {
+      // Remove all existing players from the group
+      final deleteQuery = delete(db.playerGroupTable)
+        ..where((tbl) => tbl.groupId.equals(groupId));
+      await deleteQuery.go();
+
+      // Add new players to the player table if they don't exist
+      await Future.wait(
+        newPlayers.map((player) async {
+          if (!await db.playerDao.playerExists(playerId: player.id)) {
+            await db.playerDao.addPlayer(player: player);
+          }
+        }),
+      );
+
+      // Add the new players to the group
+      await db.batch(
+        (b) => b.insertAll(
+          db.playerGroupTable,
+          newPlayers
+              .map(
+                (player) => PlayerGroupTableCompanion.insert(
+                  playerId: player.id,
+                  groupId: groupId,
+                ),
+              )
+              .toList(),
+          mode: InsertMode.insertOrReplace,
+        ),
+      );
+    });
+    return true;
+  }
+
+  /* Delete */
+
+  /// Removes a player from a group based on [playerId] and [groupId].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> removePlayerFromGroup({
+    required String playerId,
+    required String groupId,
+  }) async {
+    final query = delete(playerGroupTable)
+      ..where(
+        (tbl) => tbl.playerId.equals(playerId) & tbl.groupId.equals(groupId),
+      );
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
 }

lib/data/dao/player_group_dao.g.dart

@@ -8,4 +8,19 @@ mixin _$PlayerGroupDaoMixin on DatabaseAccessor<AppDatabase> {
   $GroupTableTable get groupTable => attachedDatabase.groupTable;
   $PlayerGroupTableTable get playerGroupTable =>
       attachedDatabase.playerGroupTable;
+  PlayerGroupDaoManager get managers => PlayerGroupDaoManager(this);
+}
+
+class PlayerGroupDaoManager {
+  final _$PlayerGroupDaoMixin _db;
+  PlayerGroupDaoManager(this._db);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
+  $$GroupTableTableTableManager get groupTable =>
+      $$GroupTableTableTableManager(_db.attachedDatabase, _db.groupTable);
+  $$PlayerGroupTableTableTableManager get playerGroupTable =>
+      $$PlayerGroupTableTableTableManager(
+        _db.attachedDatabase,
+        _db.playerGroupTable,
+      );
 }

lib/data/dao/player_match_dao.dart

@@ -1,51 +1,46 @@
 import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/player_match_table.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/player_match_table.dart';
+import 'package:tallee/data/db/tables/team_table.dart';
+import 'package:tallee/data/models/player.dart';
 
 part 'player_match_dao.g.dart';
 
-@DriftAccessor(tables: [PlayerMatchTable])
+@DriftAccessor(tables: [PlayerMatchTable, TeamTable])
 class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
     with _$PlayerMatchDaoMixin {
   PlayerMatchDao(super.db);
 
+  /* Create */
+
   /// Associates a player with a match by inserting a record into the
-  /// [PlayerMatchTable].
-  Future<void> addPlayerToMatch({
+  /// [PlayerMatchTable]. Optionally associates with a team and sets initial score.
+  Future<bool> addPlayerToMatch({
     required String matchId,
     required String playerId,
+    String? teamId,
   }) async {
-    await into(playerMatchTable).insert(
-      PlayerMatchTableCompanion.insert(playerId: playerId, matchId: matchId),
-      mode: InsertMode.insertOrIgnore,
+    final rowsAffected = await into(playerMatchTable).insert(
+      PlayerMatchTableCompanion.insert(
+        playerId: playerId,
+        matchId: matchId,
+        teamId: Value(teamId),
+      ),
+      mode: InsertMode.insertOrReplace,
     );
+    return rowsAffected > 0;
   }
 
-  /// Retrieves a list of [Player]s associated with the given [matchId].
-  /// Returns null if no players are found.
-  Future<List<Player>?> getPlayersOfMatch({required String matchId}) async {
-    final result = await (select(
-      playerMatchTable,
-    )..where((p) => p.matchId.equals(matchId))).get();
-
-    if (result.isEmpty) return null;
-
-    final futures = result.map(
-      (row) => db.playerDao.getPlayerById(playerId: row.playerId),
-    );
-    final players = await Future.wait(futures);
-    return players;
-  }
+  /* Read */
 
   /// Checks if there are any players associated with the given [matchId].
   /// Returns `true` if there are players, otherwise `false`.
-  Future<bool> matchHasPlayers({required String matchId}) async {
+  Future<bool> hasMatchPlayers({required String matchId}) async {
     final count =
         await (selectOnly(playerMatchTable)
               ..where(playerMatchTable.matchId.equals(matchId))
               ..addColumns([playerMatchTable.playerId.count()]))
-            .map((row) => row.read(playerMatchTable.playerId.count()))
+            .map((tbl) => tbl.read(playerMatchTable.playerId.count()))
             .getSingle();
     return (count ?? 0) > 0;
   }
@@ -61,48 +56,97 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
               ..where(playerMatchTable.matchId.equals(matchId))
               ..where(playerMatchTable.playerId.equals(playerId))
               ..addColumns([playerMatchTable.playerId.count()]))
-            .map((row) => row.read(playerMatchTable.playerId.count()))
+            .map((tbl) => tbl.read(playerMatchTable.playerId.count()))
             .getSingle();
     return (count ?? 0) > 0;
   }
 
-  /// Removes the association of a player with a match by deleting the record
-  /// from the [PlayerMatchTable].
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> removePlayerFromMatch({
+  /// Retrieves a list of [Player]s associated with the given [matchId].
+  /// Returns empty list if no players are found.
+  Future<List<Player>> getPlayersOfMatch({required String matchId}) async {
+    final result = await (select(
+      playerMatchTable,
+    )..where((tbl) => tbl.matchId.equals(matchId))).get();
+
+    if (result.isEmpty) return [];
+
+    final futures = result.map(
+      (row) => db.playerDao.getPlayerById(playerId: row.playerId),
+    );
+    final players = await Future.wait(futures);
+    return players;
+  }
+
+  /// Retrieves a list of [Player]s associated with a specific team in a match.
+  /// Returns empty list if no players are found for the team in the match.
+  Future<List<Player>> getPlayersOfTeamInMatch({
+    required String matchId,
+    required String teamId,
+  }) async {
+    final result =
+        await (select(playerMatchTable)
+              ..where((tbl) => tbl.matchId.equals(matchId))
+              ..where((tbl) => tbl.teamId.equals(teamId)))
+            .get();
+
+    if (result.isEmpty) return [];
+
+    final futures = result.map(
+      (row) => db.playerDao.getPlayerById(playerId: row.playerId),
+    );
+    final players = await Future.wait(futures);
+    return players;
+  }
+
+  /* Updated */
+
+  /// Updates the team for a player in a match.
+  /// Returns `true` if the update was successful, otherwise `false`.
+  Future<bool> updatePlayersTeam({
     required String matchId,
     required String playerId,
+    required String? teamId,
   }) async {
-    final query = delete(playerMatchTable)
-      ..where((pg) => pg.matchId.equals(matchId))
-      ..where((pg) => pg.playerId.equals(playerId));
-    final rowsAffected = await query.go();
+    final rowsAffected =
+        await (update(playerMatchTable)..where(
+              (tbl) =>
+                  tbl.matchId.equals(matchId) & tbl.playerId.equals(playerId),
+            ))
+            .write(PlayerMatchTableCompanion(teamId: Value(teamId)));
     return rowsAffected > 0;
   }
 
   /// Updates the players associated with a match based on the provided
-  /// [newPlayer] list. It adds new players and removes players that are no
+  /// [player] list. It adds new players and removes players that are no
   /// longer associated with the match.
-  Future<void> updatePlayersFromMatch({
+  Future<bool> updateMatchPlayers({
     required String matchId,
-    required List<Player> newPlayer,
+    required List<Player> player,
   }) async {
+    if (player.isEmpty) return false;
+
     final currentPlayers = await getPlayersOfMatch(matchId: matchId);
     // Create sets of player IDs for easy comparison
-    final currentPlayerIds = currentPlayers?.map((p) => p.id).toSet() ?? {};
-    final newPlayerIdsSet = newPlayer.map((p) => p.id).toSet();
+    final currentPlayerIds = currentPlayers.map((p) => p.id).toSet();
+    final newPlayerIdsSet = player.map((p) => p.id).toSet();
+
+    // Are the current and new player identical?
+    if (currentPlayerIds.containsAll(newPlayerIdsSet) &&
+        newPlayerIdsSet.containsAll(currentPlayerIds)) {
+      return false;
+    }
 
     // Determine players to add and remove
     final playersToAdd = newPlayerIdsSet.difference(currentPlayerIds);
     final playersToRemove = currentPlayerIds.difference(newPlayerIdsSet);
 
-    db.transaction(() async {
+    await db.transaction(() async {
       // Remove old players
       if (playersToRemove.isNotEmpty) {
         await (delete(playerMatchTable)..where(
-              (pg) =>
-                  pg.matchId.equals(matchId) &
-                  pg.playerId.isIn(playersToRemove.toList()),
+              (tbl) =>
+                  tbl.matchId.equals(matchId) &
+                  tbl.playerId.isIn(playersToRemove.toList()),
             ))
             .go();
       }
@@ -126,5 +170,22 @@ class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
         );
       }
     });
+    return true;
+  }
+
+  /* Delete */
+
+  /// Removes the association of a player with a match by deleting the record
+  /// from the [PlayerMatchTable].
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> removePlayerFromMatch({
+    required String matchId,
+    required String playerId,
+  }) async {
+    final query = delete(playerMatchTable)
+      ..where((tbl) => tbl.matchId.equals(matchId))
+      ..where((tbl) => tbl.playerId.equals(playerId));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
   }
 }

lib/data/dao/player_match_dao.g.dart

@@ -5,7 +5,31 @@ part of 'player_match_dao.dart';
 // ignore_for_file: type=lint
 mixin _$PlayerMatchDaoMixin on DatabaseAccessor<AppDatabase> {
   $PlayerTableTable get playerTable => attachedDatabase.playerTable;
+  $GameTableTable get gameTable => attachedDatabase.gameTable;
+  $GroupTableTable get groupTable => attachedDatabase.groupTable;
   $MatchTableTable get matchTable => attachedDatabase.matchTable;
+  $TeamTableTable get teamTable => attachedDatabase.teamTable;
   $PlayerMatchTableTable get playerMatchTable =>
       attachedDatabase.playerMatchTable;
+  PlayerMatchDaoManager get managers => PlayerMatchDaoManager(this);
+}
+
+class PlayerMatchDaoManager {
+  final _$PlayerMatchDaoMixin _db;
+  PlayerMatchDaoManager(this._db);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
+  $$GameTableTableTableManager get gameTable =>
+      $$GameTableTableTableManager(_db.attachedDatabase, _db.gameTable);
+  $$GroupTableTableTableManager get groupTable =>
+      $$GroupTableTableTableManager(_db.attachedDatabase, _db.groupTable);
+  $$MatchTableTableTableManager get matchTable =>
+      $$MatchTableTableTableManager(_db.attachedDatabase, _db.matchTable);
+  $$TeamTableTableTableManager get teamTable =>
+      $$TeamTableTableTableManager(_db.attachedDatabase, _db.teamTable);
+  $$PlayerMatchTableTableTableManager get playerMatchTable =>
+      $$PlayerMatchTableTableTableManager(
+        _db.attachedDatabase,
+        _db.playerMatchTable,
+      );
 }

lib/data/dao/score_entry_dao.dart

@@ -0,0 +1,406 @@
+import 'dart:async';
+
+import 'package:drift/drift.dart';
+import 'package:tallee/data/db/database.dart';
+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_entry_dao.g.dart';
+
+@DriftAccessor(tables: [ScoreEntryTable])
+class ScoreEntryDao extends DatabaseAccessor<AppDatabase>
+    with _$ScoreEntryDaoMixin {
+  ScoreEntryDao(super.db);
+
+  /* Create */
+
+  /// Adds a score entry to the database.
+  Future<void> addScore({
+    required String playerId,
+    required String matchId,
+    required ScoreEntry entry,
+  }) async {
+    await into(scoreEntryTable).insert(
+      ScoreEntryTableCompanion.insert(
+        playerId: playerId,
+        matchId: matchId,
+        roundNumber: entry.roundNumber,
+        score: entry.score,
+        change: entry.change,
+      ),
+      mode: InsertMode.insertOrReplace,
+    );
+  }
+
+  Future<void> addScoresAsList({
+    required List<ScoreEntry> entrys,
+    required String playerId,
+    required String matchId,
+  }) async {
+    if (entrys.isEmpty) return;
+    final entries = entrys
+        .map(
+          (score) => ScoreEntryTableCompanion.insert(
+            playerId: playerId,
+            matchId: matchId,
+            roundNumber: score.roundNumber,
+            score: score.score,
+            change: score.change,
+          ),
+        )
+        .toList();
+
+    await batch((batch) {
+      batch.insertAll(
+        scoreEntryTable,
+        entries,
+        mode: InsertMode.insertOrReplace,
+      );
+    });
+  }
+
+  /* Read */
+
+  /// Retrieves the score for a specific round.
+  Future<ScoreEntry?> getScore({
+    required String playerId,
+    required String matchId,
+    int roundNumber = 0,
+  }) async {
+    final query = select(scoreEntryTable)
+      ..where(
+        (tbl) =>
+            tbl.playerId.equals(playerId) &
+            tbl.matchId.equals(matchId) &
+            tbl.roundNumber.equals(roundNumber),
+      );
+
+    final result = await query.getSingleOrNull();
+    if (result == null) return null;
+
+    return ScoreEntry(
+      roundNumber: result.roundNumber,
+      score: result.score,
+      change: result.change,
+    );
+  }
+
+  /// Retrieves all scores for a specific match.
+  Future<Map<String, ScoreEntry?>> getAllMatchScores({
+    required String matchId,
+  }) async {
+    final query = select(scoreEntryTable)
+      ..where((tbl) => tbl.matchId.equals(matchId));
+    final result = await query.get();
+
+    final Map<String, ScoreEntry?> scoresByPlayer = {};
+    for (final row in result) {
+      final score = ScoreEntry(
+        roundNumber: row.roundNumber,
+        score: row.score,
+        change: row.change,
+      );
+      scoresByPlayer[row.playerId] = score;
+    }
+
+    return scoresByPlayer;
+  }
+
+  /// Retrieves all scores for a specific player in a match.
+  Future<List<ScoreEntry>> getAllPlayerScoresInMatch({
+    required String playerId,
+    required String matchId,
+  }) async {
+    final query = select(scoreEntryTable)
+      ..where(
+        (tbl) => tbl.playerId.equals(playerId) & tbl.matchId.equals(matchId),
+      )
+      ..orderBy([(tbl) => OrderingTerm.asc(tbl.roundNumber)]);
+    final result = await query.get();
+    return result
+        .map(
+          (row) => ScoreEntry(
+            roundNumber: row.roundNumber,
+            score: row.score,
+            change: row.change,
+          ),
+        )
+        .toList()
+      ..sort(
+        (scoreA, scoreB) => scoreA.roundNumber.compareTo(scoreB.roundNumber),
+      );
+  }
+
+  /// Gets the highest (latest) round number for a match.
+  /// Returns `null` if there are no scores for the match.
+  Future<int?> getLatestRoundNumber({required String matchId}) async {
+    final query = selectOnly(scoreEntryTable)
+      ..where(scoreEntryTable.matchId.equals(matchId))
+      ..addColumns([scoreEntryTable.roundNumber.max()]);
+    final row = await query.getSingle();
+    return row.read(scoreEntryTable.roundNumber.max());
+  }
+
+  /// Aggregates the total score for a player in a match by summing all their
+  /// score entry changes. Returns `0` if there are no scores for the player
+  /// in the match.
+  Future<int> getTotalScoreForPlayer({
+    required String playerId,
+    required String matchId,
+  }) async {
+    final scores = await getAllPlayerScoresInMatch(
+      playerId: playerId,
+      matchId: matchId,
+    );
+    if (scores.isEmpty) return 0;
+    // Return the sum of all score changes
+    return scores.fold<int>(0, (sum, element) => sum + element.change);
+  }
+
+  /* Update */
+
+  /// Updates a score entry.
+  Future<bool> updateScore({
+    required String playerId,
+    required String matchId,
+    required ScoreEntry entry,
+  }) async {
+    final rowsAffected =
+        await (update(scoreEntryTable)..where(
+              (tbl) =>
+                  tbl.playerId.equals(playerId) &
+                  tbl.matchId.equals(matchId) &
+                  tbl.roundNumber.equals(entry.roundNumber),
+            ))
+            .write(
+              ScoreEntryTableCompanion(
+                score: Value(entry.score),
+                change: Value(entry.change),
+              ),
+            );
+    return rowsAffected > 0;
+  }
+
+  /* Delete */
+
+  /// Deletes a score entry.
+  Future<bool> deleteScore({
+    required String playerId,
+    required String matchId,
+    int roundNumber = 0,
+  }) async {
+    final query = delete(scoreEntryTable)
+      ..where(
+        (tbl) =>
+            tbl.playerId.equals(playerId) &
+            tbl.matchId.equals(matchId) &
+            tbl.roundNumber.equals(roundNumber),
+      );
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  Future<bool> deleteAllScoresForMatch({required String matchId}) async {
+    final query = delete(scoreEntryTable)
+      ..where((tbl) => tbl.matchId.equals(matchId));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  Future<bool> deleteAllScoresForPlayerInMatch({
+    required String matchId,
+    required String playerId,
+  }) async {
+    final query = delete(scoreEntryTable)
+      ..where(
+        (tbl) => tbl.playerId.equals(playerId) & tbl.matchId.equals(matchId),
+      );
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  /* Winner handling */
+
+  Future<bool> hasWinner({required String matchId}) async {
+    return await getWinner(matchId: matchId) != null;
+  }
+
+  // Setting the winner for a game and clearing previous winner if exists.
+  Future<bool> setWinner({
+    required String matchId,
+    required String playerId,
+  }) async {
+    // Clear previous winner if exists
+    await deleteAllScoresForMatch(matchId: matchId);
+
+    // Set the winner's score to 1
+    final rowsAffected = await into(scoreEntryTable).insert(
+      ScoreEntryTableCompanion.insert(
+        playerId: playerId,
+        matchId: matchId,
+        roundNumber: 0,
+        score: 1,
+        change: 0,
+      ),
+      mode: InsertMode.insertOrReplace,
+    );
+
+    return rowsAffected > 0;
+  }
+
+  /// Retrieves the winner of a match by looking for a score entry where score
+  /// is 1. Returns `null` if no player found, else the first with the score.
+  Future<Player?> getWinner({required String matchId}) async {
+    final query =
+        select(scoreEntryTable).join([
+          innerJoin(
+            db.playerTable,
+            db.playerTable.id.equalsExp(scoreEntryTable.playerId),
+          ),
+        ])..where(
+          scoreEntryTable.matchId.equals(matchId) &
+              scoreEntryTable.score.equals(1),
+        );
+
+    final result = await query.get();
+    if (result.isEmpty) return null;
+
+    final playerData = result.first.readTable(db.playerTable);
+    return Player(
+      id: playerData.id,
+      name: playerData.name,
+      createdAt: playerData.createdAt,
+      description: playerData.description,
+    );
+  }
+
+  /// Removes the winner of a match.
+  ///
+  /// Returns `true` if the winner was removed, `false` if there are multiple
+  /// scores or if the winner cannot be removed.
+  Future<bool> removeWinner({required String matchId}) async {
+    return await deleteAllScoresForMatch(matchId: matchId);
+  }
+
+  /* multiple winners handling */
+
+  /// Sets the winners for a match.
+  ///
+  /// Returns `true` if more than 0 rows were affected
+  Future<bool> setWinners({
+    required List<Player> winners,
+    required String matchId,
+  }) async {
+    // Clear previous winners if exists
+    await deleteAllScoresForMatch(matchId: matchId);
+
+    if (winners.isEmpty) return false;
+
+    await batch((batch) {
+      batch.insertAll(
+        scoreEntryTable,
+        winners
+            .map(
+              (player) => ScoreEntryTableCompanion.insert(
+                playerId: player.id,
+                matchId: matchId,
+                roundNumber: 0,
+                score: 1,
+                change: 0,
+              ),
+            )
+            .toList(),
+        mode: InsertMode.insertOrReplace,
+      );
+    });
+
+    return true;
+  }
+
+  /* Loser handling */
+
+  Future<bool> hasLoser({required String matchId}) async {
+    return await getLoser(matchId: matchId) != null;
+  }
+
+  // Setting the looser for a game and clearing previous looser if exists.
+  Future<bool> setLoser({
+    required String matchId,
+    required String playerId,
+  }) async {
+    // Clear previous loosers if exists
+    deleteAllScoresForMatch(matchId: matchId);
+
+    // Set the loosers score to 0
+    final rowsAffected = await into(scoreEntryTable).insert(
+      ScoreEntryTableCompanion.insert(
+        playerId: playerId,
+        matchId: matchId,
+        roundNumber: 0,
+        score: 0,
+        change: 0,
+      ),
+      mode: InsertMode.insertOrReplace,
+    );
+
+    return rowsAffected > 0;
+  }
+
+  /// Retrieves the looser of a match by looking for a score entry where score
+  /// is 0. Returns `null` if no player found, else the first with the score.
+  Future<Player?> getLoser({required String matchId}) async {
+    final query =
+        select(scoreEntryTable).join([
+          innerJoin(
+            db.playerTable,
+            db.playerTable.id.equalsExp(scoreEntryTable.playerId),
+          ),
+        ])..where(
+          scoreEntryTable.matchId.equals(matchId) &
+              scoreEntryTable.score.equals(0),
+        );
+
+    final result = await query.get();
+    if (result.isEmpty) return null;
+
+    final playerData = result.first.readTable(db.playerTable);
+    return Player(
+      id: playerData.id,
+      name: playerData.name,
+      createdAt: playerData.createdAt,
+      description: playerData.description,
+    );
+  }
+
+  /// Removes the looser of a match.
+  ///
+  /// Returns `true` if the looser was removed, `false` if there are multiple
+  /// scores or if the looser cannot be removed.
+  Future<bool> removeLoser({required String matchId}) async {
+    final scores = await getAllMatchScores(matchId: matchId);
+
+    if (scores.length > 1) {
+      return false;
+    } else {
+      return await deleteAllScoresForMatch(matchId: matchId);
+    }
+  }
+
+  /* placement handling */
+
+  /// Sets the placement for each player in a match.
+  /// The highest score is assigned to the first player, the second highest to the second player, and so on.
+  Future<void> setPlacements({
+    required String matchId,
+    required List<Player> players,
+  }) async {
+    for (int i = 0; i < players.length; i++) {
+      await db.scoreEntryDao.addScore(
+        matchId: matchId,
+        playerId: players[i].id,
+        entry: ScoreEntry(roundNumber: 0, score: players.length - i, change: 0),
+      );
+    }
+  }
+}

lib/data/dao/score_entry_dao.g.dart

@@ -0,0 +1,31 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'score_entry_dao.dart';
+
+// ignore_for_file: type=lint
+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;
+  ScoreEntryDaoManager get managers => ScoreEntryDaoManager(this);
+}
+
+class ScoreEntryDaoManager {
+  final _$ScoreEntryDaoMixin _db;
+  ScoreEntryDaoManager(this._db);
+  $$PlayerTableTableTableManager get playerTable =>
+      $$PlayerTableTableTableManager(_db.attachedDatabase, _db.playerTable);
+  $$GameTableTableTableManager get gameTable =>
+      $$GameTableTableTableManager(_db.attachedDatabase, _db.gameTable);
+  $$GroupTableTableTableManager get groupTable =>
+      $$GroupTableTableTableManager(_db.attachedDatabase, _db.groupTable);
+  $$MatchTableTableTableManager get matchTable =>
+      $$MatchTableTableTableManager(_db.attachedDatabase, _db.matchTable);
+  $$ScoreEntryTableTableTableManager get scoreEntryTable =>
+      $$ScoreEntryTableTableTableManager(
+        _db.attachedDatabase,
+        _db.scoreEntryTable,
+      );
+}

lib/data/dao/statistic_dao.dart

@@ -0,0 +1,127 @@
+import 'package:collection/collection.dart';
+import 'package:drift/drift.dart';
+import 'package:tallee/core/enums.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/statistic_table.dart';
+import 'package:tallee/data/models/statistic.dart';
+
+part 'statistic_dao.g.dart';
+
+@DriftAccessor(tables: [StatisticTable])
+class StatisticDao extends DatabaseAccessor<AppDatabase>
+    with _$StatisticDaoMixin {
+  StatisticDao(super.db);
+
+  /* Create */
+
+  Future<bool> addStatistic({required Statistic statistic}) async {
+    await into(statisticTable).insert(
+      StatisticTableCompanion.insert(
+        id: statistic.id,
+        type: statistic.type.name,
+        timeframe: Value(statistic.timeframe?.name),
+        displayCount: Value(statistic.displayCount),
+      ),
+      mode: InsertMode.insertOrReplace,
+    );
+
+    await db.statisticScopeDao.addStatisticScopes(
+      statisticId: statistic.id,
+      scopes: statistic.scopes,
+    );
+
+    if (statistic.selectedGroups != null) {
+      await db.statisticGroupDao.addStatisticGroups(
+        statisticId: statistic.id,
+        groups: statistic.selectedGroups!,
+      );
+    }
+
+    if (statistic.selectedGames != null) {
+      await db.statisticGameDao.addStatisticGames(
+        statisticId: statistic.id,
+        games: statistic.selectedGames!,
+      );
+    }
+
+    return true;
+  }
+
+  /* Read */
+
+  Future<Statistic?> getStatisticById(String statisticId) async {
+    final query = select(statisticTable);
+    final row = await query.getSingleOrNull();
+    if (row != null) {
+      final groups = await db.statisticGroupDao.getGroupsForStatistic(row.id);
+      final games = await db.statisticGameDao.getGamesForStatistic(row.id);
+      final scopes = await db.statisticScopeDao.getScopeForStatistic(row.id);
+
+      return Statistic(
+        type: StatisticType.values.firstWhere((type) => type.name == row.type),
+        scopes: scopes,
+        timeframe: Timeframe.values.firstWhereOrNull(
+          (t) => t.name == row.timeframe,
+        ),
+        selectedGroups: groups,
+        selectedGames: games,
+        displayCount: row.displayCount,
+        id: row.id,
+      );
+    }
+    return null;
+  }
+
+  /// Retrieves all statistics from the database, including their associated groups and games.
+  Future<List<Statistic>> getAllStatistics() async {
+    final query = select(statisticTable);
+    final result = await query.get();
+    return Future.wait(
+      result.map((row) async {
+        final groups = await db.statisticGroupDao.getGroupsForStatistic(row.id);
+        final games = await db.statisticGameDao.getGamesForStatistic(row.id);
+        final scopes = await db.statisticScopeDao.getScopeForStatistic(row.id);
+
+        return Statistic(
+          type: StatisticType.values.firstWhere(
+            (type) => type.name == row.type,
+          ),
+          scopes: scopes,
+          timeframe: Timeframe.values.firstWhereOrNull(
+            (t) => t.name == row.timeframe,
+          ),
+          selectedGroups: groups,
+          selectedGames: games,
+          displayCount: row.displayCount,
+          id: row.id,
+        );
+      }),
+    );
+  }
+
+  /* Update */
+
+  Future<bool> updateDisplayCount(String statisticId, int displayCount) async {
+    final rowsUpdated =
+        await (update(statisticTable)
+              ..where((tbl) => tbl.id.equals(statisticId)))
+            .write(StatisticTableCompanion(displayCount: Value(displayCount)));
+
+    return rowsUpdated > 0;
+  }
+
+  /* Delete */
+
+  Future<bool> deleteStatistic(String statisticId) async {
+    final rowsDeleted = await (delete(
+      statisticTable,
+    )..where((tbl) => tbl.id.equals(statisticId))).go();
+
+    return rowsDeleted > 0;
+  }
+
+  Future<bool> deleteAllStatistics() async {
+    final rowsDeleted = await delete(statisticTable).go();
+    return rowsDeleted > 0;
+  }
+}

lib/data/dao/statistic_dao.g.dart

@@ -0,0 +1,19 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'statistic_dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$StatisticDaoMixin on DatabaseAccessor<AppDatabase> {
+  $StatisticTableTable get statisticTable => attachedDatabase.statisticTable;
+  StatisticDaoManager get managers => StatisticDaoManager(this);
+}
+
+class StatisticDaoManager {
+  final _$StatisticDaoMixin _db;
+  StatisticDaoManager(this._db);
+  $$StatisticTableTableTableManager get statisticTable =>
+      $$StatisticTableTableTableManager(
+        _db.attachedDatabase,
+        _db.statisticTable,
+      );
+}

lib/data/dao/statistic_game_dao.dart

@@ -0,0 +1,61 @@
+import 'package:drift/drift.dart';
+import 'package:tallee/core/enums.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/statistic_game_table.dart';
+import 'package:tallee/data/models/game.dart';
+
+part 'statistic_game_dao.g.dart';
+
+@DriftAccessor(tables: [StatisticGameTable])
+class StatisticGameDao extends DatabaseAccessor<AppDatabase>
+    with _$StatisticGameDaoMixin {
+  StatisticGameDao(super.db);
+
+  /// Retrieves a list of games associated with a specific statistic.
+  Future<List<Game>?> getGamesForStatistic(String statisticId) async {
+    final query = select(statisticGameTable).join([
+      innerJoin(gameTable, gameTable.id.equalsExp(statisticGameTable.gameId)),
+    ])..where(statisticGameTable.statisticId.equals(statisticId));
+
+    final results = await query.map((row) => row.readTable(gameTable)).get();
+    if (results.isEmpty) return null;
+    return results
+        .map(
+          (row) => Game(
+            id: row.id,
+            name: row.name,
+            ruleset: Ruleset.values.firstWhere((e) => e.name == row.ruleset),
+            description: row.description,
+            color: AppColor.values.firstWhere((e) => e.name == row.color),
+            icon: row.icon,
+            createdAt: row.createdAt,
+          ),
+        )
+        .toList();
+  }
+
+  Future<bool> addStatisticGames({
+    required String statisticId,
+    required List<Game> games,
+  }) {
+    final entries = games
+        .map(
+          (game) => StatisticGameTableCompanion.insert(
+            statisticId: statisticId,
+            gameId: game.id,
+          ),
+        )
+        .toList();
+
+    return batch((batch) {
+      batch.insertAll(
+        statisticGameTable,
+        entries,
+        mode: InsertMode.insertOrReplace,
+      );
+    }).then((_) => true).catchError((error) {
+      print('Error adding statistic games: $error');
+      return false;
+    });
+  }
+}

lib/data/dao/statistic_game_dao.g.dart

@@ -0,0 +1,29 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'statistic_game_dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$StatisticGameDaoMixin on DatabaseAccessor<AppDatabase> {
+  $StatisticTableTable get statisticTable => attachedDatabase.statisticTable;
+  $GameTableTable get gameTable => attachedDatabase.gameTable;
+  $StatisticGameTableTable get statisticGameTable =>
+      attachedDatabase.statisticGameTable;
+  StatisticGameDaoManager get managers => StatisticGameDaoManager(this);
+}
+
+class StatisticGameDaoManager {
+  final _$StatisticGameDaoMixin _db;
+  StatisticGameDaoManager(this._db);
+  $$StatisticTableTableTableManager get statisticTable =>
+      $$StatisticTableTableTableManager(
+        _db.attachedDatabase,
+        _db.statisticTable,
+      );
+  $$GameTableTableTableManager get gameTable =>
+      $$GameTableTableTableManager(_db.attachedDatabase, _db.gameTable);
+  $$StatisticGameTableTableTableManager get statisticGameTable =>
+      $$StatisticGameTableTableTableManager(
+        _db.attachedDatabase,
+        _db.statisticGameTable,
+      );
+}

lib/data/dao/statistic_group_dao.dart

@@ -0,0 +1,67 @@
+import 'package:drift/drift.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/group_table.dart';
+import 'package:tallee/data/db/tables/statistic_group_table.dart';
+import 'package:tallee/data/models/group.dart';
+
+part 'statistic_group_dao.g.dart';
+
+@DriftAccessor(tables: [StatisticGroupTable, GroupTable])
+class StatisticGroupDao extends DatabaseAccessor<AppDatabase>
+    with _$StatisticGroupDaoMixin {
+  StatisticGroupDao(super.db);
+
+  /// Retrieves a list of groups associated with a specific statistic.
+  Future<List<Group>?> getGroupsForStatistic(String statisticId) async {
+    final query = select(statisticGroupTable).join([
+      innerJoin(
+        groupTable,
+        groupTable.id.equalsExp(statisticGroupTable.groupId),
+      ),
+    ])..where(statisticGroupTable.statisticId.equals(statisticId));
+
+    final results = await query.map((row) => row.readTable(groupTable)).get();
+    if (results.isEmpty) return null;
+    final groups = await Future.wait(
+      results.map((result) async {
+        final groupMembers = await db.playerGroupDao.getPlayersOfGroup(
+          groupId: result.id,
+        );
+        return Group(
+          id: result.id,
+          createdAt: result.createdAt,
+          name: result.name,
+          description: result.description,
+          members: groupMembers,
+        );
+      }),
+    );
+
+    return groups;
+  }
+
+  Future<bool> addStatisticGroups({
+    required String statisticId,
+    required List<Group> groups,
+  }) async {
+    final entries = groups
+        .map(
+          (group) => StatisticGroupTableCompanion.insert(
+            statisticId: statisticId,
+            groupId: group.id,
+          ),
+        )
+        .toList();
+
+    return batch((batch) {
+      batch.insertAll(
+        statisticGroupTable,
+        entries,
+        mode: InsertMode.insertOrReplace,
+      );
+    }).then((_) => true).catchError((error) {
+      print('Error adding statistic groups: $error');
+      return false;
+    });
+  }
+}

lib/data/dao/statistic_group_dao.g.dart

@@ -0,0 +1,29 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'statistic_group_dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$StatisticGroupDaoMixin on DatabaseAccessor<AppDatabase> {
+  $StatisticTableTable get statisticTable => attachedDatabase.statisticTable;
+  $GroupTableTable get groupTable => attachedDatabase.groupTable;
+  $StatisticGroupTableTable get statisticGroupTable =>
+      attachedDatabase.statisticGroupTable;
+  StatisticGroupDaoManager get managers => StatisticGroupDaoManager(this);
+}
+
+class StatisticGroupDaoManager {
+  final _$StatisticGroupDaoMixin _db;
+  StatisticGroupDaoManager(this._db);
+  $$StatisticTableTableTableManager get statisticTable =>
+      $$StatisticTableTableTableManager(
+        _db.attachedDatabase,
+        _db.statisticTable,
+      );
+  $$GroupTableTableTableManager get groupTable =>
+      $$GroupTableTableTableManager(_db.attachedDatabase, _db.groupTable);
+  $$StatisticGroupTableTableTableManager get statisticGroupTable =>
+      $$StatisticGroupTableTableTableManager(
+        _db.attachedDatabase,
+        _db.statisticGroupTable,
+      );
+}

lib/data/dao/statistic_scope_dao.dart

@@ -0,0 +1,55 @@
+import 'package:drift/drift.dart';
+import 'package:tallee/core/enums.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/statistic_scope_table.dart';
+
+part 'statistic_scope_dao.g.dart';
+
+@DriftAccessor(tables: [StatisticScopeTable])
+class StatisticScopeDao extends DatabaseAccessor<AppDatabase>
+    with _$StatisticScopeDaoMixin {
+  StatisticScopeDao(super.db);
+
+  /// Retrieves a list of statistic scopes associated with a specific statistic ID.
+  Future<List<StatisticScope>> getScopeForStatistic(String statisticId) async {
+    final query = select(statisticScopeTable)
+      ..where((tbl) => tbl.statisticId.equals(statisticId));
+
+    final result = await query.get();
+    return result
+        .map(
+          (row) => StatisticScope.values.firstWhere(
+            (e) => e.name == row.scope,
+            orElse: () => throw Exception(
+              'Invalid scope value: ${row.scope} for statistic ID: $statisticId',
+            ),
+          ),
+        )
+        .toList();
+  }
+
+  Future<bool> addStatisticScopes({
+    required String statisticId,
+    required List<StatisticScope> scopes,
+  }) async {
+    final entries = scopes
+        .map(
+          (scope) => StatisticScopeTableCompanion.insert(
+            statisticId: statisticId,
+            scope: scope.name,
+          ),
+        )
+        .toList();
+
+    return batch((batch) {
+      batch.insertAll(
+        statisticScopeTable,
+        entries,
+        mode: InsertMode.insertOrReplace,
+      );
+    }).then((_) => true).catchError((error) {
+      print('Error adding statistic scopes: $error');
+      return false;
+    });
+  }
+}

lib/data/dao/statistic_scope_dao.g.dart

@@ -0,0 +1,26 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'statistic_scope_dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$StatisticScopeDaoMixin on DatabaseAccessor<AppDatabase> {
+  $StatisticTableTable get statisticTable => attachedDatabase.statisticTable;
+  $StatisticScopeTableTable get statisticScopeTable =>
+      attachedDatabase.statisticScopeTable;
+  StatisticScopeDaoManager get managers => StatisticScopeDaoManager(this);
+}
+
+class StatisticScopeDaoManager {
+  final _$StatisticScopeDaoMixin _db;
+  StatisticScopeDaoManager(this._db);
+  $$StatisticTableTableTableManager get statisticTable =>
+      $$StatisticTableTableTableManager(
+        _db.attachedDatabase,
+        _db.statisticTable,
+      );
+  $$StatisticScopeTableTableTableManager get statisticScopeTable =>
+      $$StatisticScopeTableTableTableManager(
+        _db.attachedDatabase,
+        _db.statisticScopeTable,
+      );
+}

lib/data/dao/team_dao.dart

@@ -0,0 +1,182 @@
+import 'package:drift/drift.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/player_match_table.dart';
+import 'package:tallee/data/db/tables/team_table.dart';
+import 'package:tallee/data/models/player.dart';
+import 'package:tallee/data/models/team.dart';
+
+part 'team_dao.g.dart';
+
+@DriftAccessor(tables: [TeamTable, PlayerMatchTable])
+class TeamDao extends DatabaseAccessor<AppDatabase> with _$TeamDaoMixin {
+  TeamDao(super.db);
+
+  /* Create */
+
+  /// Adds a new [team] to the database.
+  /// Returns `true` if the team was added, `false` otherwise.
+  Future<bool> addTeam({required Team team, required String matchId}) async {
+    if (await teamExists(teamId: team.id)) return false;
+    await into(teamTable).insert(
+      TeamTableCompanion.insert(
+        id: team.id,
+        name: team.name,
+        createdAt: team.createdAt,
+      ),
+      mode: InsertMode.insertOrReplace,
+    );
+    await db.batch((batch) async {
+      for (final player in team.members) {
+        await into(playerMatchTable).insert(
+          PlayerMatchTableCompanion.insert(
+            playerId: player.id,
+            matchId: matchId,
+            teamId: Value(team.id),
+          ),
+          mode: InsertMode.insertOrReplace,
+        );
+      }
+    });
+    return true;
+  }
+
+  /// Adds multiple [teams] to the database in a batch operation.
+  Future<bool> addTeamsAsList({
+    required List<Team> teams,
+    required String matchId,
+  }) async {
+    if (teams.isEmpty) return false;
+
+    await db.batch(
+      (b) => b.insertAll(
+        teamTable,
+        teams
+            .map(
+              (team) => TeamTableCompanion.insert(
+                id: team.id,
+                name: team.name,
+                createdAt: team.createdAt,
+              ),
+            )
+            .toList(),
+        mode: InsertMode.insertOrIgnore,
+      ),
+    );
+
+    for (final team in teams) {
+      await db.batch((batch) async {
+        for (final player in team.members) {
+          await into(db.playerMatchTable).insert(
+            PlayerMatchTableCompanion.insert(
+              playerId: player.id,
+              matchId: matchId,
+              teamId: Value(team.id),
+            ),
+            mode: InsertMode.insertOrReplace,
+          );
+        }
+      });
+    }
+    return true;
+  }
+
+  /* Read */
+
+  /// Retrieves the total count of teams in the database.
+  Future<int> getTeamCount() async {
+    final count =
+        await (selectOnly(teamTable)..addColumns([teamTable.id.count()]))
+            .map((tbl) => tbl.read(teamTable.id.count()))
+            .getSingle();
+    return count ?? 0;
+  }
+
+  /// Checks if a team with the given [teamId] exists in the database.
+  /// Returns `true` if the team exists, `false` otherwise.
+  Future<bool> teamExists({required String teamId}) async {
+    final query = select(teamTable)..where((t) => t.id.equals(teamId));
+    final row = await query.getSingleOrNull();
+    return row != null;
+  }
+
+  /// Retrieves all teams from the database.
+  Future<List<Team>> getAllTeams() async {
+    final query = select(teamTable);
+    final result = await query.get();
+    return Future.wait(
+      result.map((row) async {
+        final members = await _getTeamMembers(teamId: row.id);
+        return Team(
+          id: row.id,
+          name: row.name,
+          createdAt: row.createdAt,
+          members: members,
+        );
+      }),
+    );
+  }
+
+  /// Retrieves a [Team] by its [teamId], including its members.
+  Future<Team> getTeamById({required String teamId}) async {
+    final query = select(teamTable)..where((t) => t.id.equals(teamId));
+    final row = await query.getSingle();
+    final members = await _getTeamMembers(teamId: teamId);
+    return Team(
+      id: row.id,
+      name: row.name,
+      createdAt: row.createdAt,
+      members: members,
+    );
+  }
+
+  /// Helper method to get team members from PlayerMatchTable.
+  Future<List<Player>> _getTeamMembers({required String teamId}) async {
+    // Get all player_match entries with this teamId
+    final playerMatchQuery = select(db.playerMatchTable)
+      ..where((tbl) => tbl.teamId.equals(teamId));
+    final playerMatches = await playerMatchQuery.get();
+
+    if (playerMatches.isEmpty) return [];
+
+    // Get unique player IDs
+    final playerIds = playerMatches.map((tbl) => tbl.playerId).toSet();
+
+    // Fetch all players
+    final players = await Future.wait(
+      playerIds.map((id) => db.playerDao.getPlayerById(playerId: id)),
+    );
+    return players;
+  }
+
+  /* Update */
+
+  /// Updates the name of the team with the given [teamId].
+  Future<bool> updateTeamName({
+    required String teamId,
+    required String name,
+  }) async {
+    final rowsAffected =
+        await (update(teamTable)..where((tbl) => tbl.id.equals(teamId))).write(
+          TeamTableCompanion(name: Value(name)),
+        );
+    return rowsAffected > 0;
+  }
+
+  /* Delete */
+
+  /// Deletes all teams from the database.
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> deleteAllTeams() async {
+    final query = delete(teamTable);
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+
+  /// Deletes the team with the given [teamId] from the database.
+  /// Returns `true` if the team was deleted, `false` otherwise.
+  Future<bool> deleteTeam({required String teamId}) async {
+    final query = delete(teamTable)..where((tbl) => tbl.id.equals(teamId));
+    final rowsAffected = await query.go();
+    return rowsAffected > 0;
+  }
+}