Merge pull request 'MVP' (#141) from development into main

Reviewed-on: #141
Reviewed-by: gelbeinhalb <spam@yannick-weigert.de>

.gitea/workflows/pull_request.yaml

@@ -0,0 +1,57 @@
+name: Pull Request Pipeline
+
+on:
+  pull_request:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - 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: Get dependencies
+        run: flutter pub get
+
+      - name: Analyze Formatting
+        run: flutter analyze lib test
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        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: Get dependencies
+        run: flutter pub get
+
+      - name: Run tests
+        run: flutter test

.gitea/workflows/push.yaml

@@ -0,0 +1,50 @@
+name: Push Pipeline
+
+on:
+  push:
+    branches:
+      - "development"
+      - "main"
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    if: false # Needs bot user
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        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: Get & upgrade dependencies
+        run: |
+          flutter pub get
+          flutter pub upgrade --major-versions
+
+      - name: Auto-format
+        run: |
+          dart format lib
+          dart fix --apply lib 
+
+        # Needs credentials, push access and the right files need to be staged
+      - name: Commit Changes
+        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

.gitignore

@@ -195,3 +195,4 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+/devtools_options.yaml

android/app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
+            android:screenOrientation="portrait"
             android:launchMode="singleTop"
             android:taskAffinity=""
             android:theme="@style/LaunchTheme"

android/app/src/main/res/drawable/launch_background.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
+    <item android:drawable="@color/launch_background" />
 
     <!-- You can insert your own image assets here -->
     <!-- <item>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

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

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

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

@@ -0,0 +1,5 @@
+<?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>
+</resources>

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

@@ -4,7 +4,7 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
-        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowBackground">@color/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your

assets/schema.json

@@ -1,137 +1,104 @@
-
-
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
   "properties": {
-    "games": {
+    "players": {
       "type": "array",
-      "items": [
+      "items": {
-        {
+        "type": "object",
-          "type": "object",
+        "properties": {
-          "properties": {
+          "id": {
-            "id": {
+            "type": "string"
-              "type": "string"
-            },
-            "name": {
-              "type": "string"
-            },
-            "players": {
-              "type": "null"
-            },
-            "group": {
-              "type": "null"
-            },
-            "winner": {
-              "type": "string"
-            }
           },
-          "required": [
+          "createdAt": {
-            "id",
+            "type": "string"
-            "name",
+          },
-            "players",
+          "name": {
-            "group",
+            "type": "string"
-            "winner"
+          }
-          ]
+        },
-        }
+        "required": [
-      ]
+          "id",
+          "createdAt",
+          "name"
+        ]
+      }
     },
     "groups": {
       "type": "array",
-      "items": [
+      "items": {
-        {
+        "type": "object",
-          "type": "object",
+        "properties": {
-          "properties": {
+          "id": {
-            "id": {
+            "type": "string"
-              "type": "string"
-            },
-            "name": {
-              "type": "string"
-            },
-            "members": {
-              "type": "array",
-              "items": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "id": {
-                      "type": "string"
-                    },
-                    "name": {
-                      "type": "string"
-                    }
-                  },
-                  "required": [
-                    "id",
-                    "name"
-                  ]
-                },
-                {
-                  "type": "object",
-                  "properties": {
-                    "id": {
-                      "type": "string"
-                    },
-                    "name": {
-                      "type": "string"
-                    }
-                  },
-                  "required": [
-                    "id",
-                    "name"
-                  ]
-                }
-              ]
-            }
           },
-          "required": [
+          "name": {
-            "id",
+            "type": "string"
-            "name",
+          },
-            "members"
+          "createdAt": {
-          ]
+            "type": "string"
-        }
+          },
-      ]
+          "memberIds": {
-    },
+            "type": "array",
-    "players": {
+            "items": {
-      "type": "array",
-      "items": [
-        {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "name": {
               "type": "string"
             }
-          },
+          }
-          "required": [
-            "id",
-            "name"
-          ]
         },
-        {
+        "required": [
-          "type": "object",
+          "id",
-          "properties": {
+          "name",
-            "id": {
+          "createdAt",
-              "type": "string"
+          "memberIds"
-            },
+        ]
-            "name": {
+      }
+    },
+    "matches": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "createdAt": {
+            "type": "string"
+          },
+          "groupId": {
+            "anyOf": [
+              {"type": "string"},
+              {"type": "null"}
+            ]
+          },
+          "playerIds": {
+            "type": "array",
+            "items": {
               "type": "string"
             }
           },
-          "required": [
+          "winnerId": {
-            "id",
+            "anyOf": [
-            "name"
+              {"type": "string"},
-          ]
+              {"type": "null"}
-        }
+            ]
-      ]
+          }
+        },
+        "required": [
+          "id",
+          "name",
+          "createdAt",
+          "groupId",
+          "playerIds"
+        ]
+      }
     }
   },
   "required": [
-    "games",
+    "players",
     "groups",
-    "players"
+    "matches"
   ]
-}
+}
-

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

@@ -1,122 +1,14 @@
 {
   "images" : [
     {
-      "size" : "20x20",
+      "filename" : "icon_x1024.png",
-      "idiom" : "iphone",
+      "idiom" : "universal",
-      "filename" : "Icon-App-20x20@2x.png",
+      "platform" : "ios",
-      "scale" : "2x"
+      "size" : "1024x1024"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
 }

ios/Runner/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md

@@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.

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

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.043",
+          "green" : "0.043",
+          "red" : "0.043"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -1,23 +1,21 @@
 {
   "images" : [
     {
+      "filename" : "icon.png",
       "idiom" : "universal",
-      "filename" : "LaunchImage.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "LaunchImage@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "LaunchImage@3x.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
+    "author" : "xcode",
-    "author" : "xcode"
+    "version" : 1
   }
 }

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" 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="24412" 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="12089"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24405"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,24 +17,27 @@
                         <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
+                            <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" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" name="LauncherBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
-                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="80.152671755725194" y="264.08450704225356"/>
         </scene>
     </scenes>
+    <color key="tintColor" red="0.90196078431372551" green="0.94509803921568625" blue="0.89411764705882346" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
-        <image name="LaunchImage" width="168" height="185"/>
+        <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>
     </resources>
 </document>

ios/Runner/Base.lproj/Main.storyboard

@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24412" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24405"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Flutter View Controller-->
@@ -14,13 +16,14 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="141" y="131"/>
         </scene>
     </scenes>
 </document>

ios/Runner/Info.plist

@@ -31,8 +31,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>

l10n.yaml

@@ -0,0 +1,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

lib/core/constants.dart

@@ -0,0 +1,6 @@
+class Constants {
+  Constants._(); // Private constructor to prevent instantiation
+
+  /// Minimum duration of all app skeletons
+  static Duration minimumSkeletonDuration = const Duration(milliseconds: 250);
+}

lib/core/custom_theme.dart

@@ -1,22 +1,59 @@
 import 'package:flutter/material.dart';
 
 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;
 
+  // ==================== Border Radius ====================
+  static const double standardBorderRadius = 12.0;
+  static BorderRadius get standardBorderRadiusAll =>
+      BorderRadius.circular(standardBorderRadius);
+
+  // ==================== Padding & Margins ====================
+  static const EdgeInsets standardMargin = EdgeInsets.symmetric(
+    horizontal: 12,
+    vertical: 10,
+  );
+  static const EdgeInsets tileMargin = EdgeInsets.symmetric(
+    horizontal: 12,
+    vertical: 5,
+  );
+
+  // ==================== Decorations ====================
+  static BoxDecoration standardBoxDecoration = BoxDecoration(
+    color: boxColor,
+    border: Border.all(color: boxBorder),
+    borderRadius: standardBorderRadiusAll,
+  );
+
+  static BoxDecoration highlightedBoxDecoration = BoxDecoration(
+    color: boxColor,
+    border: Border.all(color: primaryColor),
+    borderRadius: standardBorderRadiusAll,
+    boxShadow: [BoxShadow(color: primaryColor.withAlpha(120), blurRadius: 12)],
+  );
+
+  // ==================== App Bar Theme ====================
   static AppBarTheme appBarTheme = AppBarTheme(
     backgroundColor: backgroundColor,
-    foregroundColor: Colors.white,
+    foregroundColor: textColor,
     elevation: 0,
+    scrolledUnderElevation: 0,
+    centerTitle: true,
     titleTextStyle: const TextStyle(
-      color: Colors.white,
+      color: textColor,
       fontSize: 20,
       fontWeight: FontWeight.bold,
+      overflow: TextOverflow.ellipsis,
     ),
-    iconTheme: const IconThemeData(color: Colors.white),
+    iconTheme: const IconThemeData(color: textColor),
   );
 }

lib/core/enums.dart

@@ -0,0 +1,52 @@
+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.
+/// - [ButtonType.tertiary]: Tertiary button style.
+enum ButtonType { primary, secondary, tertiary }
+
+/// Result types for import operations in the [SettingsView]
+/// - [ImportResult.success]: The import operation was successful.
+/// - [ImportResult.canceled]: The import operation was canceled by the user.
+/// - [ImportResult.fileReadError]: There was an error reading the selected file.
+/// - [ImportResult.invalidSchema]: The JSON schema of the imported data is invalid.
+/// - [ImportResult.formatException]: A format exception occurred during import.
+/// - [ImportResult.unknownException]: An exception occurred during import.
+enum ImportResult {
+  success,
+  canceled,
+  fileReadError,
+  invalidSchema,
+  formatException,
+  unknownException,
+}
+
+/// Result types for export operations in the [SettingsView]
+/// - [ExportResult.success]: The export operation was successful.
+/// - [ExportResult.canceled]: The export operation was canceled by the user.
+/// - [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;
+  }
+}

lib/data/dao/game_dao.dart

@@ -1,99 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/game_table.dart';
-import 'package:game_tracker/data/dto/game.dart';
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/data/dto/player.dart';
-
-part 'game_dao.g.dart';
-
-@DriftAccessor(tables: [GameTable])
-class GameDao extends DatabaseAccessor<AppDatabase> with _$GameDaoMixin {
-  GameDao(super.db);
-
-  /// 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)).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 result = await query.getSingle();
-
-    List<Player>? players;
-    if (await db.playerGameDao.gameHasPlayers(gameId: gameId)) {
-      players = await db.playerGameDao.getPlayersByGameId(gameId: gameId);
-    }
-    Group? group;
-    if (await db.groupGameDao.hasGameGroup(gameId: gameId)) {
-      group = await db.groupGameDao.getGroupByGameId(gameId: gameId);
-    }
-
-    return Game(
-      id: result.id,
-      name: result.name,
-      players: players,
-      group: group,
-      winner: result.winnerId,
-    );
-  }
-
-  /// Adds a new [Game] to the database.
-  /// Also adds associated players and group if they exist.
-  Future<void> addGame({required Game game}) async {
-    await db.transaction(() async {
-      for (final p in game.players ?? []) {
-        await db.playerDao.addPlayer(player: p);
-        await db.playerGameDao.addPlayerToGame(gameId: game.id, playerId: p.id);
-      }
-      if (game.group != null) {
-        await db.groupDao.addGroup(group: game.group!);
-        await db.groupGameDao.addGroupToGame(game.id, game.group!.id);
-      }
-      await into(gameTable).insert(
-        GameTableCompanion.insert(
-          id: game.id,
-          name: game.name,
-          winnerId: Value(game.winner),
-        ),
-        mode: InsertMode.insertOrReplace,
-      );
-    });
-  }
-
-  /// Deletes the game with the given [gameId] from the database.
-  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
-  Future<bool> deleteGame({required String gameId}) async {
-    final query = delete(gameTable)..where((g) => g.id.equals(gameId));
-    final rowsAffected = await query.go();
-    return rowsAffected > 0;
-  }
-
-  /// Retrieves the number 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, otherwise `false`.
-  Future<bool> gameExists({required String gameId}) async {
-    final query = select(gameTable)..where((g) => g.id.equals(gameId));
-    final result = await query.getSingleOrNull();
-    return result != null;
-  }
-
-  /// 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;
-  }
-}

lib/data/dao/game_dao.g.dart

@@ -1,8 +0,0 @@
-// 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;
-}

lib/data/dao/group_dao.dart

@@ -1,12 +1,13 @@
 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';
 
 part 'group_dao.g.dart';
 
-@DriftAccessor(tables: [GroupTable])
+@DriftAccessor(tables: [GroupTable, PlayerGroupTable])
 class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
   GroupDao(super.db);
 
@@ -16,10 +17,15 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
     final result = await query.get();
     return Future.wait(
       result.map((groupData) async {
-        final members = await db.playerGroupDao.getPlayersOfGroupById(
+        final members = await db.playerGroupDao.getPlayersOfGroup(
           groupId: groupData.id,
         );
-        return Group(id: groupData.id, name: groupData.name, members: members);
+        return Group(
+          id: groupData.id,
+          name: groupData.name,
+          members: members,
+          createdAt: groupData.createdAt,
+        );
       }),
     );
   }
@@ -29,11 +35,16 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
     final query = select(groupTable)..where((g) => g.id.equals(groupId));
     final result = await query.getSingle();
 
-    List<Player> members = await db.playerGroupDao.getPlayersOfGroupById(
+    List<Player> members = await db.playerGroupDao.getPlayersOfGroup(
       groupId: groupId,
     );
 
-    return Group(id: result.id, name: result.name, members: members);
+    return Group(
+      id: result.id,
+      name: result.name,
+      members: members,
+      createdAt: result.createdAt,
+    );
   }
 
   /// Adds a new group with the given [id] and [name] to the database.
@@ -41,9 +52,17 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
   Future<bool> addGroup({required Group group}) async {
     if (!await groupExists(groupId: group.id)) {
       await db.transaction(() async {
-        await into(
+        await into(groupTable).insert(
-          groupTable,
+          GroupTableCompanion.insert(
-        ).insert(GroupTableCompanion.insert(id: group.id, name: group.name));
+            id: group.id,
+            name: group.name,
+            createdAt: group.createdAt,
+          ),
+          mode: InsertMode.insertOrReplace,
+        );
+        await Future.wait(
+          group.members.map((player) => db.playerDao.addPlayer(player: player)),
+        );
         await db.batch(
           (b) => b.insertAll(
             db.playerGroupTable,
@@ -55,17 +74,98 @@ class GroupDao extends DatabaseAccessor<AppDatabase> with _$GroupDaoMixin {
                   ),
                 )
                 .toList(),
+            mode: InsertMode.insertOrReplace,
           ),
         );
-        await Future.wait(
-          group.members.map((player) => db.playerDao.addPlayer(player: player)),
-        );
-        return true;
       });
+      return true;
     }
     return false;
   }
 
+  /// Adds multiple groups to the database.
+  /// Also adds the group's members to the [PlayerGroupTable].
+  Future<void> addGroupsAsList({required List<Group> groups}) async {
+    if (groups.isEmpty) return;
+    await db.transaction(() async {
+      // Deduplicate groups by id - keep first occurrence
+      final Map<String, Group> uniqueGroups = {};
+      for (final g in groups) {
+        uniqueGroups.putIfAbsent(g.id, () => g);
+      }
+
+      // Insert unique groups in batch
+      // Using insertOrIgnore to avoid triggering cascade deletes on
+      // player_group associations when groups already exist
+      await db.batch(
+        (b) => b.insertAll(
+          groupTable,
+          uniqueGroups.values
+              .map(
+                (group) => GroupTableCompanion.insert(
+                  id: group.id,
+                  name: group.name,
+                  createdAt: group.createdAt,
+                ),
+              )
+              .toList(),
+          mode: InsertMode.insertOrIgnore,
+        ),
+      );
+
+      // Collect unique players from all groups
+      final uniquePlayers = <String, Player>{};
+      for (final g in uniqueGroups.values) {
+        for (final m in g.members) {
+          uniquePlayers[m.id] = m;
+        }
+      }
+
+      if (uniquePlayers.isNotEmpty) {
+        // Using insertOrIgnore to avoid triggering cascade deletes on
+        // player_group associations when players already exist
+        await db.batch(
+          (b) => b.insertAll(
+            db.playerTable,
+            uniquePlayers.values
+                .map(
+                  (p) => PlayerTableCompanion.insert(
+                    id: p.id,
+                    name: p.name,
+                    createdAt: p.createdAt,
+                  ),
+                )
+                .toList(),
+            mode: InsertMode.insertOrIgnore,
+          ),
+        );
+      }
+
+      // Prepare all player-group associations in one list (unique pairs)
+      final Set<String> seenPairs = {};
+      final List<PlayerGroupTableCompanion> pgRows = [];
+      for (final g in uniqueGroups.values) {
+        for (final m in g.members) {
+          final key = '${m.id}|${g.id}';
+          if (!seenPairs.contains(key)) {
+            seenPairs.add(key);
+            pgRows.add(
+              PlayerGroupTableCompanion.insert(playerId: m.id, groupId: g.id),
+            );
+          }
+        }
+      }
+
+      if (pgRows.isNotEmpty) {
+        await db.batch((b) {
+          for (final pg in pgRows) {
+            b.insert(db.playerGroupTable, pg, mode: InsertMode.insertOrReplace);
+          }
+        });
+      }
+    });
+  }
+
   /// 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 {

lib/data/dao/group_dao.g.dart

@@ -5,4 +5,7 @@ part of 'group_dao.dart';
 // ignore_for_file: type=lint
 mixin _$GroupDaoMixin on DatabaseAccessor<AppDatabase> {
   $GroupTableTable get groupTable => attachedDatabase.groupTable;
+  $PlayerTableTable get playerTable => attachedDatabase.playerTable;
+  $PlayerGroupTableTable get playerGroupTable =>
+      attachedDatabase.playerGroupTable;
 }

lib/data/dao/group_game_dao.dart

@@ -1,42 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/group_game_table.dart';
-import 'package:game_tracker/data/dto/group.dart';
-
-part 'group_game_dao.g.dart';
-
-@DriftAccessor(tables: [GroupGameTable])
-class GroupGameDao extends DatabaseAccessor<AppDatabase>
-    with _$GroupGameDaoMixin {
-  GroupGameDao(super.db);
-
-  /// Checks if there is a group associated with the given [gameId].
-  /// Returns `true` if there is a group, otherwise `false`.
-  Future<bool> hasGameGroup({required String gameId}) async {
-    final count =
-        await (selectOnly(groupGameTable)
-              ..where(groupGameTable.gameId.equals(gameId))
-              ..addColumns([groupGameTable.groupId.count()]))
-            .map((row) => row.read(groupGameTable.groupId.count()))
-            .getSingle();
-    return (count ?? 0) > 0;
-  }
-
-  /// Retrieves the [Group] associated with the given [gameId].
-  Future<Group> getGroupByGameId({required String gameId}) async {
-    final result = await (select(
-      groupGameTable,
-    )..where((g) => g.gameId.equals(gameId))).getSingle();
-
-    final group = await db.groupDao.getGroupById(groupId: result.groupId);
-    return group;
-  }
-
-  /// Associates a group with a game by inserting a record into the
-  /// [GroupGameTable].
-  Future<void> addGroupToGame(String gameId, String groupId) async {
-    await into(
-      groupGameTable,
-    ).insert(GroupGameTableCompanion.insert(groupId: groupId, gameId: gameId));
-  }
-}

lib/data/dao/group_game_dao.g.dart

@@ -1,10 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'group_game_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$GroupGameDaoMixin on DatabaseAccessor<AppDatabase> {
-  $GroupTableTable get groupTable => attachedDatabase.groupTable;
-  $GameTableTable get gameTable => attachedDatabase.gameTable;
-  $GroupGameTableTable get groupGameTable => attachedDatabase.groupGameTable;
-}

lib/data/dao/group_match_dao.dart

@@ -0,0 +1,98 @@
+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

@@ -0,0 +1,10 @@
+// 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

@@ -0,0 +1,326 @@
+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';
+
+part 'match_dao.g.dart';
+
+@DriftAccessor(tables: [MatchTable])
+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();
+
+    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 {
+    await db.transaction(() async {
+      await into(matchTable).insert(
+        MatchTableCompanion.insert(
+          id: match.id,
+          name: match.name,
+          winnerId: Value(match.winner?.id),
+          createdAt: match.createdAt,
+        ),
+        mode: InsertMode.insertOrReplace,
+      );
+
+      if (match.players != null) {
+        for (final p in match.players ?? []) {
+          await db.playerMatchDao.addPlayerToMatch(
+            matchId: match.id,
+            playerId: p.id,
+          );
+        }
+      }
+
+      if (match.group != null) {
+        await db.groupMatchDao.addGroupToMatch(
+          matchId: match.id,
+          groupId: match.group!.id,
+        );
+      }
+    });
+  }
+
+  /// Adds multiple [Match]s 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;
+    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 groups of the matches in batch
+      // Using insertOrIgnore to avoid overwriting existing groups (which would
+      // trigger cascade deletes on player_group associations)
+      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,
+                ),
+              )
+              .toList(),
+          mode: InsertMode.insertOrIgnore,
+        ),
+      );
+
+      // Add all players of the matches in batch (unique)
+      final uniquePlayers = <String, Player>{};
+      for (final match in matches) {
+        if (match.players != null) {
+          for (final p in match.players!) {
+            uniquePlayers[p.id] = p;
+          }
+        }
+        // Also include members of groups
+        if (match.group != null) {
+          for (final m in match.group!.members) {
+            uniquePlayers[m.id] = m;
+          }
+        }
+      }
+
+      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,
+            uniquePlayers.values
+                .map(
+                  (p) => PlayerTableCompanion.insert(
+                    id: p.id,
+                    name: p.name,
+                    createdAt: p.createdAt,
+                  ),
+                )
+                .toList(),
+            mode: InsertMode.insertOrIgnore,
+          ),
+        );
+      }
+
+      // 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 ?? []) {
+              b.insert(
+                db.playerMatchTable,
+                PlayerMatchTableCompanion.insert(
+                  matchId: match.id,
+                  playerId: p.id,
+                ),
+                mode: InsertMode.insertOrIgnore,
+              );
+            }
+          }
+        }
+      });
+
+      // Add all player-group associations in batch
+      await db.batch((b) {
+        for (final match in matches) {
+          if (match.group != null) {
+            for (final m in match.group!.members) {
+              b.insert(
+                db.playerGroupTable,
+                PlayerGroupTableCompanion.insert(
+                  playerId: m.id,
+                  groupId: match.group!.id,
+                ),
+                mode: InsertMode.insertOrIgnore,
+              );
+            }
+          }
+        }
+      });
+
+      // 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,
+            );
+          }
+        }
+      });
+    });
+  }
+
+  /// 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;
+  }
+
+  /// 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()))
+            .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 {
+    final query = select(matchTable)..where((g) => g.id.equals(matchId));
+    final result = await query.getSingleOrNull();
+    return result != null;
+  }
+
+  /// Deletes all matches from the database.
+  /// Returns `true` if more than 0 rows were affected, otherwise `false`.
+  Future<bool> deleteAllMatches() async {
+    final query = delete(matchTable);
+    final rowsAffected = await query.go();
+    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;
+  }
+}

lib/data/dao/match_dao.g.dart

@@ -0,0 +1,8 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'match_dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$MatchDaoMixin on DatabaseAccessor<AppDatabase> {
+  $MatchTableTable get matchTable => attachedDatabase.matchTable;
+}

lib/data/dao/player_dao.dart

@@ -13,14 +13,22 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
   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)).toList();
+    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);
+    return Player(
+      id: result.id,
+      name: result.name,
+      createdAt: result.createdAt,
+    );
   }
 
   /// Adds a new [player] to the database.
@@ -28,14 +36,44 @@ class PlayerDao extends DatabaseAccessor<AppDatabase> with _$PlayerDaoMixin {
   /// the new one.
   Future<bool> addPlayer({required Player player}) async {
     if (!await playerExists(playerId: player.id)) {
-      await into(
+      await into(playerTable).insert(
-        playerTable,
+        PlayerTableCompanion.insert(
-      ).insert(PlayerTableCompanion.insert(id: player.id, name: player.name));
+          id: player.id,
+          name: player.name,
+          createdAt: player.createdAt,
+        ),
+        mode: InsertMode.insertOrReplace,
+      );
       return true;
     }
     return false;
   }
 
+  /// Adds multiple [players] to the database in a batch operation.
+  /// Uses insertOrIgnore to avoid triggering cascade deletes on
+  /// player_group associations when players already exist.
+  Future<bool> addPlayersAsList({required List<Player> players}) async {
+    if (players.isEmpty) return false;
+
+    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,
+      ),
+    );
+
+    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 {

lib/data/dao/player_game_dao.dart

@@ -1,51 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/player_game_table.dart';
-import 'package:game_tracker/data/dto/player.dart';
-
-part 'player_game_dao.g.dart';
-
-@DriftAccessor(tables: [PlayerGameTable])
-class PlayerGameDao extends DatabaseAccessor<AppDatabase>
-    with _$PlayerGameDaoMixin {
-  PlayerGameDao(super.db);
-
-  /// Checks if there are any players associated with the given [gameId].
-  /// Returns `true` if there are players, otherwise `false`.
-  Future<bool> gameHasPlayers({required String gameId}) async {
-    final count =
-        await (selectOnly(playerGameTable)
-              ..where(playerGameTable.gameId.equals(gameId))
-              ..addColumns([playerGameTable.playerId.count()]))
-            .map((row) => row.read(playerGameTable.playerId.count()))
-            .getSingle();
-    return (count ?? 0) > 0;
-  }
-
-  /// Retrieves a list of [Player]s associated with the given [gameId].
-  /// Returns an empty list if no players are found.
-  Future<List<Player>> getPlayersByGameId({required String gameId}) async {
-    final result = await (select(
-      playerGameTable,
-    )..where((p) => p.gameId.equals(gameId))).get();
-
-    if (result.isEmpty) return <Player>[];
-
-    final futures = result.map(
-      (row) => db.playerDao.getPlayerById(playerId: row.playerId),
-    );
-    final players = await Future.wait(futures);
-    return players.whereType<Player>().toList();
-  }
-
-  /// Associates a player with a game by inserting a record into the
-  /// [PlayerGameTable].
-  Future<void> addPlayerToGame({
-    required String gameId,
-    required String playerId,
-  }) async {
-    await into(playerGameTable).insert(
-      PlayerGameTableCompanion.insert(playerId: playerId, gameId: gameId),
-    );
-  }
-}

lib/data/dao/player_game_dao.g.dart

@@ -1,10 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'player_game_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$PlayerGameDaoMixin on DatabaseAccessor<AppDatabase> {
-  $PlayerTableTable get playerTable => attachedDatabase.playerTable;
-  $GameTableTable get gameTable => attachedDatabase.gameTable;
-  $PlayerGameTableTable get playerGameTable => attachedDatabase.playerGameTable;
-}

lib/data/dao/player_group_dao.dart

@@ -1,17 +1,44 @@
 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';
 
 part 'player_group_dao.g.dart';
 
-@DriftAccessor(tables: [PlayerGroupTable])
+@DriftAccessor(tables: [PlayerGroupTable, PlayerTable])
 class PlayerGroupDao extends DatabaseAccessor<AppDatabase>
     with _$PlayerGroupDaoMixin {
   PlayerGroupDao(super.db);
 
+  /// No need for a groupHasPlayers method since the members attribute is
+  /// not nullable
+
+  /// Adds a [player] to a group with the given [groupId].
+  /// If the player is already in the group, no action is taken.
+  /// If the player does not exist in the player table, they are added.
+  /// Returns `true` if the player was added, otherwise `false`.
+  Future<bool> addPlayerToGroup({
+    required Player player,
+    required String groupId,
+  }) async {
+    if (await isPlayerInGroup(playerId: player.id, groupId: groupId)) {
+      return false;
+    }
+
+    if (!await db.playerDao.playerExists(playerId: player.id)) {
+      db.playerDao.addPlayer(player: player);
+    }
+
+    await into(playerGroupTable).insert(
+      PlayerGroupTableCompanion.insert(playerId: player.id, groupId: groupId),
+    );
+
+    return true;
+  }
+
   /// Retrieves all players belonging to a specific group by [groupId].
-  Future<List<Player>> getPlayersOfGroupById({required String groupId}) async {
+  Future<List<Player>> getPlayersOfGroup({required String groupId}) async {
     final query = select(playerGroupTable)
       ..where((pG) => pG.groupId.equals(groupId));
     final result = await query.get();
@@ -38,29 +65,6 @@ class PlayerGroupDao extends DatabaseAccessor<AppDatabase>
     return rowsAffected > 0;
   }
 
-  /// Adds a [player] to a group with the given [groupId].
-  /// If the player is already in the group, no action is taken.
-  /// If the player does not exist in the player table, they are added.
-  /// Returns `true` if the player was added, otherwise `false`.
-  Future<bool> addPlayerToGroup({
-    required Player player,
-    required String groupId,
-  }) async {
-    if (await isPlayerInGroup(playerId: player.id, groupId: groupId)) {
-      return false;
-    }
-
-    if (await db.playerDao.playerExists(playerId: player.id) == false) {
-      db.playerDao.addPlayer(player: player);
-    }
-
-    await into(playerGroupTable).insert(
-      PlayerGroupTableCompanion.insert(playerId: player.id, groupId: groupId),
-    );
-
-    return true;
-  }
-
   /// Checks if a player with [playerId] is in the group with [groupId].
   /// Returns `true` if the player is in the group, otherwise `false`.
   Future<bool> isPlayerInGroup({

lib/data/dao/player_match_dao.dart

@@ -0,0 +1,130 @@
+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';
+
+part 'player_match_dao.g.dart';
+
+@DriftAccessor(tables: [PlayerMatchTable])
+class PlayerMatchDao extends DatabaseAccessor<AppDatabase>
+    with _$PlayerMatchDaoMixin {
+  PlayerMatchDao(super.db);
+
+  /// Associates a player with a match by inserting a record into the
+  /// [PlayerMatchTable].
+  Future<void> addPlayerToMatch({
+    required String matchId,
+    required String playerId,
+  }) async {
+    await into(playerMatchTable).insert(
+      PlayerMatchTableCompanion.insert(playerId: playerId, matchId: matchId),
+      mode: InsertMode.insertOrIgnore,
+    );
+  }
+
+  /// 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;
+  }
+
+  /// 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 {
+    final count =
+        await (selectOnly(playerMatchTable)
+              ..where(playerMatchTable.matchId.equals(matchId))
+              ..addColumns([playerMatchTable.playerId.count()]))
+            .map((row) => row.read(playerMatchTable.playerId.count()))
+            .getSingle();
+    return (count ?? 0) > 0;
+  }
+
+  /// Checks if a specific player is associated with a specific match.
+  /// Returns `true` if the player is in the match, otherwise `false`.
+  Future<bool> isPlayerInMatch({
+    required String matchId,
+    required String playerId,
+  }) async {
+    final count =
+        await (selectOnly(playerMatchTable)
+              ..where(playerMatchTable.matchId.equals(matchId))
+              ..where(playerMatchTable.playerId.equals(playerId))
+              ..addColumns([playerMatchTable.playerId.count()]))
+            .map((row) => row.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({
+    required String matchId,
+    required String playerId,
+  }) async {
+    final query = delete(playerMatchTable)
+      ..where((pg) => pg.matchId.equals(matchId))
+      ..where((pg) => pg.playerId.equals(playerId));
+    final rowsAffected = await query.go();
+    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
+  /// longer associated with the match.
+  Future<void> updatePlayersFromMatch({
+    required String matchId,
+    required List<Player> newPlayer,
+  }) async {
+    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();
+
+    // Determine players to add and remove
+    final playersToAdd = newPlayerIdsSet.difference(currentPlayerIds);
+    final playersToRemove = currentPlayerIds.difference(newPlayerIdsSet);
+
+    db.transaction(() async {
+      // Remove old players
+      if (playersToRemove.isNotEmpty) {
+        await (delete(playerMatchTable)..where(
+              (pg) =>
+                  pg.matchId.equals(matchId) &
+                  pg.playerId.isIn(playersToRemove.toList()),
+            ))
+            .go();
+      }
+
+      // Add new players
+      if (playersToAdd.isNotEmpty) {
+        final inserts = playersToAdd
+            .map(
+              (id) => PlayerMatchTableCompanion.insert(
+                playerId: id,
+                matchId: matchId,
+              ),
+            )
+            .toList();
+        await Future.wait(
+          inserts.map(
+            (c) => into(
+              playerMatchTable,
+            ).insert(c, mode: InsertMode.insertOrIgnore),
+          ),
+        );
+      }
+    });
+  }
+}

lib/data/dao/player_match_dao.g.dart

@@ -0,0 +1,11 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'player_match_dao.dart';
+
+// ignore_for_file: type=lint
+mixin _$PlayerMatchDaoMixin on DatabaseAccessor<AppDatabase> {
+  $PlayerTableTable get playerTable => attachedDatabase.playerTable;
+  $MatchTableTable get matchTable => attachedDatabase.matchTable;
+  $PlayerMatchTableTable get playerMatchTable =>
+      attachedDatabase.playerMatchTable;
+}

lib/data/db/database.dart

@@ -1,16 +1,16 @@
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
-import 'package:game_tracker/data/dao/game_dao.dart';
 import 'package:game_tracker/data/dao/group_dao.dart';
-import 'package:game_tracker/data/dao/group_game_dao.dart';
+import 'package:game_tracker/data/dao/group_match_dao.dart';
+import 'package:game_tracker/data/dao/match_dao.dart';
 import 'package:game_tracker/data/dao/player_dao.dart';
-import 'package:game_tracker/data/dao/player_game_dao.dart';
 import 'package:game_tracker/data/dao/player_group_dao.dart';
-import 'package:game_tracker/data/db/tables/game_table.dart';
+import 'package:game_tracker/data/dao/player_match_dao.dart';
-import 'package:game_tracker/data/db/tables/group_game_table.dart';
+import 'package:game_tracker/data/db/tables/group_match_table.dart';
 import 'package:game_tracker/data/db/tables/group_table.dart';
-import 'package:game_tracker/data/db/tables/player_game_table.dart';
+import 'package:game_tracker/data/db/tables/match_table.dart';
 import 'package:game_tracker/data/db/tables/player_group_table.dart';
+import 'package:game_tracker/data/db/tables/player_match_table.dart';
 import 'package:game_tracker/data/db/tables/player_table.dart';
 import 'package:path_provider/path_provider.dart';
 
@@ -20,18 +20,18 @@ part 'database.g.dart';
   tables: [
     PlayerTable,
     GroupTable,
-    GameTable,
+    MatchTable,
     PlayerGroupTable,
-    PlayerGameTable,
+    PlayerMatchTable,
-    GroupGameTable,
+    GroupMatchTable,
   ],
   daos: [
     PlayerDao,
     GroupDao,
-    GameDao,
+    MatchDao,
     PlayerGroupDao,
-    PlayerGameDao,
+    PlayerMatchDao,
-    GroupGameDao,
+    GroupMatchDao,
   ],
 )
 class AppDatabase extends _$AppDatabase {

lib/data/db/tables/group_game_table.dart

@@ -1,13 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/tables/game_table.dart';
-import 'package:game_tracker/data/db/tables/group_table.dart';
-
-class GroupGameTable extends Table {
-  TextColumn get groupId =>
-      text().references(GroupTable, #id, onDelete: KeyAction.cascade)();
-  TextColumn get gameId =>
-      text().references(GameTable, #id, onDelete: KeyAction.cascade)();
-
-  @override
-  Set<Column<Object>> get primaryKey => {groupId, gameId};
-}

lib/data/db/tables/group_match_table.dart

@@ -0,0 +1,13 @@
+import 'package:drift/drift.dart';
+import 'package:game_tracker/data/db/tables/group_table.dart';
+import 'package:game_tracker/data/db/tables/match_table.dart';
+
+class GroupMatchTable extends Table {
+  TextColumn get groupId =>
+      text().references(GroupTable, #id, onDelete: KeyAction.cascade)();
+  TextColumn get matchId =>
+      text().references(MatchTable, #id, onDelete: KeyAction.cascade)();
+
+  @override
+  Set<Column<Object>> get primaryKey => {groupId, matchId};
+}

lib/data/db/tables/group_table.dart

@@ -3,6 +3,7 @@ import 'package:drift/drift.dart';
 class GroupTable extends Table {
   TextColumn get id => text()();
   TextColumn get name => text()();
+  DateTimeColumn get createdAt => dateTime()();
 
   @override
   Set<Column<Object>> get primaryKey => {id};

lib/data/db/tables/match_table.dart

@@ -1,9 +1,10 @@
 import 'package:drift/drift.dart';
 
-class GameTable extends Table {
+class MatchTable extends Table {
   TextColumn get id => text()();
   TextColumn get name => text()();
   late final winnerId = text().nullable()();
+  DateTimeColumn get createdAt => dateTime()();
 
   @override
   Set<Column<Object>> get primaryKey => {id};

lib/data/db/tables/player_game_table.dart

@@ -1,13 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/tables/game_table.dart';
-import 'package:game_tracker/data/db/tables/player_table.dart';
-
-class PlayerGameTable extends Table {
-  TextColumn get playerId =>
-      text().references(PlayerTable, #id, onDelete: KeyAction.cascade)();
-  TextColumn get gameId =>
-      text().references(GameTable, #id, onDelete: KeyAction.cascade)();
-
-  @override
-  Set<Column<Object>> get primaryKey => {playerId, gameId};
-}

lib/data/db/tables/player_match_table.dart

@@ -0,0 +1,13 @@
+import 'package:drift/drift.dart';
+import 'package:game_tracker/data/db/tables/match_table.dart';
+import 'package:game_tracker/data/db/tables/player_table.dart';
+
+class PlayerMatchTable extends Table {
+  TextColumn get playerId =>
+      text().references(PlayerTable, #id, onDelete: KeyAction.cascade)();
+  TextColumn get matchId =>
+      text().references(MatchTable, #id, onDelete: KeyAction.cascade)();
+
+  @override
+  Set<Column<Object>> get primaryKey => {playerId, matchId};
+}

lib/data/db/tables/player_table.dart

@@ -3,6 +3,7 @@ import 'package:drift/drift.dart';
 class PlayerTable extends Table {
   TextColumn get id => text()();
   TextColumn get name => text()();
+  DateTimeColumn get createdAt => dateTime()();
 
   @override
   Set<Column<Object>> get primaryKey => {id};

lib/data/dto/game.dart

@@ -1,40 +0,0 @@
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/data/dto/player.dart';
-import 'package:uuid/uuid.dart';
-
-class Game {
-  final String id;
-  final String name;
-  final List<Player>? players;
-  final Group? group;
-  final String? winner;
-
-  Game({String? id, required this.name, this.players, this.group, this.winner})
-    : id = id ?? const Uuid().v4();
-
-  @override
-  String toString() {
-    return 'Game{\n\tid: $id,\n\tname: $name,\n\tplayers: $players,\n\tgroup: $group,\n\twinner: $winner\n}';
-  }
-
-  /// Creates a Game instance from a JSON object.
-  Game.fromJson(Map<String, dynamic> json)
-    : id = json['id'],
-      name = json['name'],
-      players = json['players'] != null
-          ? (json['players'] as List)
-                .map((playerJson) => Player.fromJson(playerJson))
-                .toList()
-          : null,
-      group = json['group'] != null ? Group.fromJson(json['group']) : null,
-      winner = json['winner'] ?? '';
-
-  /// Converts the Game instance to a JSON object.
-  Map<String, dynamic> toJson() => {
-    'id': id,
-    'name': name,
-    'players': players?.map((player) => player.toJson()).toList(),
-    'group': group?.toJson(),
-    'winner': winner,
-  };
-}

lib/data/dto/group.dart

@@ -1,13 +1,20 @@
+import 'package:clock/clock.dart';
 import 'package:game_tracker/data/dto/player.dart';
 import 'package:uuid/uuid.dart';
 
 class Group {
   final String id;
+  final DateTime createdAt;
   final String name;
   final List<Player> members;
 
-  Group({String? id, required this.name, required this.members})
+  Group({
-    : id = id ?? const Uuid().v4();
+    String? id,
+    DateTime? createdAt,
+    required this.name,
+    required this.members,
+  }) : id = id ?? const Uuid().v4(),
+       createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
@@ -17,6 +24,7 @@ class Group {
   /// Creates a Group instance from a JSON object.
   Group.fromJson(Map<String, dynamic> json)
     : id = json['id'],
+      createdAt = DateTime.parse(json['createdAt']),
       name = json['name'],
       members = (json['members'] as List)
           .map((memberJson) => Player.fromJson(memberJson))
@@ -25,6 +33,7 @@ class Group {
   /// Converts the Group instance to a JSON object.
   Map<String, dynamic> toJson() => {
     'id': id,
+    'createdAt': createdAt.toIso8601String(),
     'name': name,
     'members': members.map((member) => member.toJson()).toList(),
   };

lib/data/dto/match.dart

@@ -0,0 +1,51 @@
+import 'package:clock/clock.dart';
+import 'package:game_tracker/data/dto/group.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:uuid/uuid.dart';
+
+class Match {
+  final String id;
+  final DateTime createdAt;
+  final String name;
+  final List<Player>? players;
+  final Group? group;
+  final Player? winner;
+
+  Match({
+    String? id,
+    DateTime? createdAt,
+    required this.name,
+    this.players,
+    this.group,
+    this.winner,
+  }) : id = id ?? const Uuid().v4(),
+       createdAt = createdAt ?? clock.now();
+
+  @override
+  String toString() {
+    return 'Match{\n\tid: $id,\n\tname: $name,\n\tplayers: $players,\n\tgroup: $group,\n\twinner: $winner\n}';
+  }
+
+  /// Creates a Match instance from a JSON object.
+  Match.fromJson(Map<String, dynamic> json)
+    : id = json['id'],
+      name = json['name'],
+      createdAt = DateTime.parse(json['createdAt']),
+      players = json['players'] != null
+          ? (json['players'] as List)
+                .map((playerJson) => Player.fromJson(playerJson))
+                .toList()
+          : null,
+      group = json['group'] != null ? Group.fromJson(json['group']) : null,
+      winner = json['winner'] != null ? Player.fromJson(json['winner']) : null;
+
+  /// Converts the Match instance to a JSON object.
+  Map<String, dynamic> toJson() => {
+    'id': id,
+    'createdAt': createdAt.toIso8601String(),
+    'name': name,
+    'players': players?.map((player) => player.toJson()).toList(),
+    'group': group?.toJson(),
+    'winner': winner?.toJson(),
+  };
+}

lib/data/dto/player.dart

@@ -1,10 +1,14 @@
+import 'package:clock/clock.dart';
 import 'package:uuid/uuid.dart';
 
 class Player {
   final String id;
+  final DateTime createdAt;
   final String name;
 
-  Player({String? id, required this.name}) : id = id ?? const Uuid().v4();
+  Player({String? id, DateTime? createdAt, required this.name})
+    : id = id ?? const Uuid().v4(),
+      createdAt = createdAt ?? clock.now();
 
   @override
   String toString() {
@@ -14,8 +18,13 @@ class Player {
   /// Creates a Player instance from a JSON object.
   Player.fromJson(Map<String, dynamic> json)
     : id = json['id'],
+      createdAt = DateTime.parse(json['createdAt']),
       name = json['name'];
 
   /// Converts the Player instance to a JSON object.
-  Map<String, dynamic> toJson() => {'id': id, 'name': name};
+  Map<String, dynamic> toJson() => {
+    'id': id,
+    'createdAt': createdAt.toIso8601String(),
+    'name': name,
+  };
 }

lib/l10n/arb/app_de.arb

@@ -0,0 +1,83 @@
+{
+  "@@locale": "de",
+  "all_players": "Alle Spieler:innen",
+  "all_players_selected": "Alle Spieler:innen ausgewählt",
+  "amount_of_matches": "Anzahl der Spiele",
+  "cancel": "Abbrechen",
+  "choose_game": "Spielvorlage wählen",
+  "choose_group": "Gruppe wählen",
+  "choose_ruleset": "Regelwerk wählen",
+  "could_not_add_player": "Spieler:in {playerName} konnte nicht hinzugefügt werden",
+  "create_group": "Gruppe erstellen",
+  "create_match": "Spiel erstellen",
+  "create_new_group": "Neue Gruppe erstellen",
+  "create_new_match": "Neues Spiel erstellen",
+  "data_successfully_deleted": "Daten erfolgreich gelöscht",
+  "data_successfully_exported": "Daten erfolgreich exportiert",
+  "data_successfully_imported": "Daten erfolgreich importiert",
+  "days_ago": "vor {count} Tagen",
+  "delete": "Löschen",
+  "delete_all_data": "Alle Daten löschen?",
+  "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
+  "error_reading_file": "Fehler beim Lesen der Datei",
+  "export_canceled": "Export abgebrochen",
+  "export_data": "Daten exportieren",
+  "format_exception": "Formatfehler (siehe Konsole)",
+  "game": "Spielvorlage",
+  "game_name": "Spielvorlagenname",
+  "group": "Gruppe",
+  "group_name": "Gruppenname",
+  "groups": "Gruppen",
+  "home": "Startseite",
+  "import_canceled": "Import abgebrochen",
+  "import_data": "Daten importieren",
+  "info": "Info",
+  "invalid_schema": "Ungültiges Schema",
+  "least_points": "Niedrigste Punkte",
+  "match_in_progress": "Spiel läuft...",
+  "match_name": "Spieltitel",
+  "matches": "Spiele",
+  "menu": "Menü",
+  "most_points": "Höchste Punkte",
+  "no_data_available": "Keine Daten verfügbar",
+  "no_groups_created_yet": "Noch keine Gruppen erstellt",
+  "no_matches_created_yet": "Noch keine Spiele erstellt",
+  "no_players_created_yet": "Noch keine Spieler:in erstellt",
+  "no_players_found_with_that_name": "Keine Spieler:in mit diesem Namen gefunden",
+  "no_players_selected": "Keine Spieler:innen ausgewählt",
+  "no_recent_matches_available": "Keine letzten Spiele verfügbar",
+  "no_second_match_available": "Kein zweites Spiel verfügbar",
+  "no_statistics_available": "Keine Statistiken verfügbar",
+  "none": "Kein",
+  "none_group": "Keine",
+  "not_available": "Nicht verfügbar",
+  "player_name": "Spieler:innenname",
+  "players": "Spieler:innen",
+  "players_count": "{count} Spieler",
+  "quick_create": "Schnellzugriff",
+  "recent_matches": "Letzte Spiele",
+  "ruleset": "Regelwerk",
+  "ruleset_least_points": "Umgekehrte Wertung: Der/die Spieler:in mit den wenigsten Punkten gewinnt.",
+  "ruleset_most_points": "Traditionelles Regelwerk: Der/die Spieler:in mit den meisten Punkten gewinnt.",
+  "ruleset_single_loser": "Genau ein:e Verlierer:in wird bestimmt; der letzte Platz erhält die Strafe oder Konsequenz.",
+  "ruleset_single_winner": "Genau ein:e Gewinner:in wird gewählt; Unentschieden werden durch einen vordefinierten Tie-Breaker aufgelöst.",
+  "search_for_groups": "Nach Gruppen suchen",
+  "search_for_players": "Nach Spieler:innen suchen",
+  "select_winner": "Gewinner:in wählen:",
+  "selected_players": "Ausgewählte Spieler:innen",
+  "settings": "Einstellungen",
+  "single_loser": "Ein:e Verlierer:in",
+  "single_winner": "Ein:e Gewinner:in",
+  "statistics": "Statistiken",
+  "stats": "Statistiken",
+  "successfully_added_player": "Spieler:in {playerName} erfolgreich hinzugefügt",
+  "there_is_no_group_matching_your_search": "Es gibt keine Gruppe, die deiner Suche entspricht",
+  "this_cannot_be_undone": "Dies kann nicht rückgängig gemacht werden",
+  "today_at": "Heute um",
+  "undo": "Rückgängig",
+  "unknown_exception": "Unbekannter Fehler (siehe Konsole)",
+  "winner": "Gewinner:in",
+  "winrate": "Siegquote",
+  "wins": "Siege",
+  "yesterday_at": "Gestern um"
+}

lib/l10n/arb/app_en.arb

@@ -0,0 +1,343 @@
+{
+  "@@locale": "en",
+  "@all_players": {
+    "description": "Label for all players list"
+  },
+  "@all_players_selected": {
+    "description": "Message when all players are added to selection"
+  },
+  "@amount_of_matches": {
+    "description": "Label for amount of matches statistic"
+  },
+  "@app_name": {
+    "description": "The name of the App"
+  },
+  "@cancel": {
+    "description": "Cancel button text"
+  },
+  "@choose_game": {
+    "description": "Label for choosing a game"
+  },
+  "@choose_group": {
+    "description": "Label for choosing a group"
+  },
+  "@choose_ruleset": {
+    "description": "Label for choosing a ruleset"
+  },
+  "@could_not_add_player": {
+    "description": "Error message when adding a player fails"
+  },
+  "@create_group": {
+    "description": "Button text to create a group"
+  },
+  "@create_match": {
+    "description": "Button text to create a match"
+  },
+  "@create_new_group": {
+    "description": "Button text to create a new group"
+  },
+  "@create_new_match": {
+    "description": "Button text to create a new match"
+  },
+  "@data_successfully_deleted": {
+    "description": "Success message after deleting data"
+  },
+  "@data_successfully_exported": {
+    "description": "Success message after exporting data"
+  },
+  "@data_successfully_imported": {
+    "description": "Success message after importing data"
+  },
+  "@days_ago": {
+    "description": "Date format for days ago",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "@delete": {
+    "description": "Delete button text"
+  },
+  "@delete_all_data": {
+    "description": "Confirmation dialog for deleting all data"
+  },
+  "@error_creating_group": {
+    "description": "Error message when group creation fails"
+  },
+  "@error_reading_file": {
+    "description": "Error message when file cannot be read"
+  },
+  "@export_canceled": {
+    "description": "Message when export is canceled"
+  },
+  "@export_data": {
+    "description": "Export data menu item"
+  },
+  "@format_exception": {
+    "description": "Error message for format exceptions"
+  },
+  "@game": {
+    "description": "Game label"
+  },
+  "@game_name": {
+    "description": "Placeholder for game name search"
+  },
+  "@group": {
+    "description": "Group label"
+  },
+  "@group_name": {
+    "description": "Placeholder for group name input"
+  },
+  "@groups": {
+    "description": "Label for groups"
+  },
+  "@home": {
+    "description": "Home tab label"
+  },
+  "@import_canceled": {
+    "description": "Message when import is canceled"
+  },
+  "@import_data": {
+    "description": "Import data menu item"
+  },
+  "@info": {
+    "description": "Info label"
+  },
+  "@invalid_schema": {
+    "description": "Error message for invalid schema"
+  },
+  "@least_points": {
+    "description": "Title for least points ruleset"
+  },
+  "@match_in_progress": {
+    "description": "Message when match is in progress"
+  },
+  "@match_name": {
+    "description": "Placeholder for match name input"
+  },
+  "@matches": {
+    "description": "Label for matches"
+  },
+  "@menu": {
+    "description": "Menu label"
+  },
+  "@most_points": {
+    "description": "Title for most points ruleset"
+  },
+  "@no_data_available": {
+    "description": "Message when no data in the statistic tiles is given"
+  },
+  "@no_groups_created_yet": {
+    "description": "Message when no groups exist"
+  },
+  "@no_matches_created_yet": {
+    "description": "Message when no matches exist"
+  },
+  "@no_players_created_yet": {
+    "description": "Message when no players exist"
+  },
+  "@no_players_found_with_that_name": {
+    "description": "Message when search returns no results"
+  },
+  "@no_players_selected": {
+    "description": "Message when no players are selected"
+  },
+  "@no_recent_matches_available": {
+    "description": "Message when no recent matches exist"
+  },
+  "@no_second_match_available": {
+    "description": "Message when no second match exists"
+  },
+  "@no_statistics_available": {
+    "description": "Message when no statistics are available, because no matches were played yet"
+  },
+  "@none": {
+    "description": "None option label"
+  },
+  "@none_group": {
+    "description": "None group option label"
+  },
+  "@not_available": {
+    "description": "Abbreviation for not available"
+  },
+  "@player_name": {
+    "description": "Placeholder for player name input"
+  },
+  "@players": {
+    "description": "Players label"
+  },
+  "@players_count": {
+    "description": "Shows the number of players",
+    "placeholders": {
+      "count": {
+        "type": "int"
+      }
+    }
+  },
+  "@quick_create": {
+    "description": "Title for quick create section"
+  },
+  "@recent_matches": {
+    "description": "Title for recent matches section"
+  },
+  "@ruleset": {
+    "description": "Ruleset label"
+  },
+  "@ruleset_least_points": {
+    "description": "Description for least points ruleset"
+  },
+  "@ruleset_most_points": {
+    "description": "Description for most points ruleset"
+  },
+  "@ruleset_single_loser": {
+    "description": "Description for single loser ruleset"
+  },
+  "@ruleset_single_winner": {
+    "description": "Description for single winner ruleset"
+  },
+  "@search_for_groups": {
+    "description": "Hint text for group search input field"
+  },
+  "@search_for_players": {
+    "description": "Hint text for player search input field"
+  },
+  "@select_winner": {
+    "description": "Label to select the winner"
+  },
+  "@selected_players": {
+    "description": "Shows the number of selected players"
+  },
+  "@settings": {
+    "description": "Settings label"
+  },
+  "@single_loser": {
+    "description": "Title for single loser ruleset"
+  },
+  "@single_winner": {
+    "description": "Title for single winner ruleset"
+  },
+  "@statistics": {
+    "description": "Statistics tab label"
+  },
+  "@stats": {
+    "description": "Stats tab label (short)"
+  },
+  "@successfully_added_player": {
+    "description": "Success message when adding a player",
+    "placeholders": {
+      "playerName": {
+        "type": "String",
+        "example": "John"
+      }
+    }
+  },
+  "@there_is_no_group_matching_your_search": {
+    "description": "Message when search returns no groups"
+  },
+  "@this_cannot_be_undone": {
+    "description": "Warning message for irreversible actions"
+  },
+  "@today_at": {
+    "description": "Date format for today"
+  },
+  "@undo": {
+    "description": "Undo button text"
+  },
+  "@unknown_exception": {
+    "description": "Error message for unknown exceptions"
+  },
+  "@winner": {
+    "description": "Winner label"
+  },
+  "@winrate": {
+    "description": "Label for winrate statistic"
+  },
+  "@wins": {
+    "description": "Label for wins statistic"
+  },
+  "@yesterday_at": {
+    "description": "Date format for yesterday"
+  },
+  "all_players": "All players",
+  "all_players_selected": "All players selected",
+  "amount_of_matches": "Amount of Matches",
+  "app_name": "Game Tracker",
+  "cancel": "Cancel",
+  "choose_game": "Choose Game",
+  "choose_group": "Choose Group",
+  "choose_ruleset": "Choose Ruleset",
+  "could_not_add_player": "Could not add player",
+  "create_group": "Create Group",
+  "create_match": "Create match",
+  "create_new_group": "Create new group",
+  "create_new_match": "Create new match",
+  "data_successfully_deleted": "Data successfully deleted",
+  "data_successfully_exported": "Data successfully exported",
+  "data_successfully_imported": "Data successfully imported",
+  "days_ago": "{count} days ago",
+  "delete": "Delete",
+  "delete_all_data": "Delete all data?",
+  "error_creating_group": "Error while creating group, please try again",
+  "error_reading_file": "Error reading file",
+  "export_canceled": "Export canceled",
+  "export_data": "Export data",
+  "format_exception": "Format Exception (see console)",
+  "game": "Game",
+  "game_name": "Game Name",
+  "group": "Group",
+  "group_name": "Group name",
+  "groups": "Groups",
+  "home": "Home",
+  "import_canceled": "Import canceled",
+  "import_data": "Import data",
+  "info": "Info",
+  "invalid_schema": "Invalid Schema",
+  "least_points": "Least Points",
+  "match_in_progress": "Match in progress...",
+  "match_name": "Match name",
+  "matches": "Matches",
+  "menu": "Menu",
+  "most_points": "Most Points",
+  "no_data_available": "No data available",
+  "no_groups_created_yet": "No groups created yet",
+  "no_matches_created_yet": "No matches created yet",
+  "no_players_created_yet": "No players created yet",
+  "no_players_found_with_that_name": "No players found with that name",
+  "no_players_selected": "No players selected",
+  "no_recent_matches_available": "No recent matches available",
+  "no_second_match_available": "No second match available",
+  "no_statistics_available": "No statistics available",
+  "none": "None",
+  "none_group": "None",
+  "not_available": "Not available",
+  "player_name": "Player name",
+  "players": "Players",
+  "players_count": "{count} Players",
+  "quick_create": "Quick Create",
+  "recent_matches": "Recent Matches",
+  "ruleset": "Ruleset",
+  "ruleset_least_points": "Inverse scoring: the player with the fewest points wins.",
+  "ruleset_most_points": "Traditional ruleset: the player with the most points wins.",
+  "ruleset_single_loser": "Exactly one loser is determined; last place receives the penalty or consequence.",
+  "ruleset_single_winner": "Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.",
+  "search_for_groups": "Search for groups",
+  "search_for_players": "Search for players",
+  "select_winner": "Select Winner:",
+  "selected_players": "Selected players",
+  "settings": "Settings",
+  "single_loser": "Single Loser",
+  "single_winner": "Single Winner",
+  "statistics": "Statistics",
+  "stats": "Stats",
+  "successfully_added_player": "Successfully added player {playerName}",
+  "there_is_no_group_matching_your_search": "There is no group matching your search",
+  "this_cannot_be_undone": "This can't be undone",
+  "today_at": "Today at",
+  "undo": "Undo",
+  "unknown_exception": "Unknown Exception (see console)",
+  "winner": "Winner",
+  "winrate": "Winrate",
+  "wins": "Wins",
+  "yesterday_at": "Yesterday at"
+}

lib/l10n/generated/app_localizations.dart

@@ -0,0 +1,620 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:intl/intl.dart' as intl;
+
+import 'app_localizations_de.dart';
+import 'app_localizations_en.dart';
+
+// ignore_for_file: type=lint
+
+/// Callers can lookup localized strings with an instance of AppLocalizations
+/// returned by `AppLocalizations.of(context)`.
+///
+/// Applications need to include `AppLocalizations.delegate()` in their app's
+/// `localizationDelegates` list, and the locales they support in the app's
+/// `supportedLocales` list. For example:
+///
+/// ```dart
+/// import 'generated/app_localizations.dart';
+///
+/// return MaterialApp(
+///   localizationsDelegates: AppLocalizations.localizationsDelegates,
+///   supportedLocales: AppLocalizations.supportedLocales,
+///   home: MyApplicationHome(),
+/// );
+/// ```
+///
+/// ## Update pubspec.yaml
+///
+/// Please make sure to update your pubspec.yaml to include the following
+/// packages:
+///
+/// ```yaml
+/// dependencies:
+///   # Internationalization support.
+///   flutter_localizations:
+///     sdk: flutter
+///   intl: any # Use the pinned version from flutter_localizations
+///
+///   # Rest of dependencies
+/// ```
+///
+/// ## iOS Applications
+///
+/// iOS applications define key application metadata, including supported
+/// locales, in an Info.plist file that is built into the application bundle.
+/// To configure the locales supported by your app, you’ll need to edit this
+/// file.
+///
+/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file.
+/// Then, in the Project Navigator, open the Info.plist file under the Runner
+/// project’s Runner folder.
+///
+/// Next, select the Information Property List item, select Add Item from the
+/// Editor menu, then select Localizations from the pop-up menu.
+///
+/// Select and expand the newly-created Localizations item then, for each
+/// locale your application supports, add a new item and select the locale
+/// you wish to add from the pop-up menu in the Value field. This list should
+/// be consistent with the languages listed in the AppLocalizations.supportedLocales
+/// property.
+abstract class AppLocalizations {
+  AppLocalizations(String locale)
+    : localeName = intl.Intl.canonicalizedLocale(locale.toString());
+
+  final String localeName;
+
+  static AppLocalizations of(BuildContext context) {
+    return Localizations.of<AppLocalizations>(context, AppLocalizations)!;
+  }
+
+  static const LocalizationsDelegate<AppLocalizations> delegate =
+      _AppLocalizationsDelegate();
+
+  /// A list of this localizations delegate along with the default localizations
+  /// delegates.
+  ///
+  /// Returns a list of localizations delegates containing this delegate along with
+  /// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
+  /// and GlobalWidgetsLocalizations.delegate.
+  ///
+  /// Additional delegates can be added by appending to this list in
+  /// MaterialApp. This list does not have to be used at all if a custom list
+  /// of delegates is preferred or required.
+  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
+      <LocalizationsDelegate<dynamic>>[
+        delegate,
+        GlobalMaterialLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+      ];
+
+  /// A list of this localizations delegate's supported locales.
+  static const List<Locale> supportedLocales = <Locale>[
+    Locale('de'),
+    Locale('en'),
+  ];
+
+  /// Label for all players list
+  ///
+  /// In en, this message translates to:
+  /// **'All players'**
+  String get all_players;
+
+  /// Message when all players are added to selection
+  ///
+  /// In en, this message translates to:
+  /// **'All players selected'**
+  String get all_players_selected;
+
+  /// Label for amount of matches statistic
+  ///
+  /// In en, this message translates to:
+  /// **'Amount of Matches'**
+  String get amount_of_matches;
+
+  /// The name of the App
+  ///
+  /// In en, this message translates to:
+  /// **'Game Tracker'**
+  String get app_name;
+
+  /// Cancel button text
+  ///
+  /// In en, this message translates to:
+  /// **'Cancel'**
+  String get cancel;
+
+  /// Label for choosing a game
+  ///
+  /// In en, this message translates to:
+  /// **'Choose Game'**
+  String get choose_game;
+
+  /// Label for choosing a group
+  ///
+  /// In en, this message translates to:
+  /// **'Choose Group'**
+  String get choose_group;
+
+  /// Label for choosing a ruleset
+  ///
+  /// In en, this message translates to:
+  /// **'Choose Ruleset'**
+  String get choose_ruleset;
+
+  /// Error message when adding a player fails
+  ///
+  /// In en, this message translates to:
+  /// **'Could not add player'**
+  String could_not_add_player(Object playerName);
+
+  /// Button text to create a group
+  ///
+  /// In en, this message translates to:
+  /// **'Create Group'**
+  String get create_group;
+
+  /// Button text to create a match
+  ///
+  /// In en, this message translates to:
+  /// **'Create match'**
+  String get create_match;
+
+  /// Button text to create a new group
+  ///
+  /// In en, this message translates to:
+  /// **'Create new group'**
+  String get create_new_group;
+
+  /// Button text to create a new match
+  ///
+  /// In en, this message translates to:
+  /// **'Create new match'**
+  String get create_new_match;
+
+  /// Success message after deleting data
+  ///
+  /// In en, this message translates to:
+  /// **'Data successfully deleted'**
+  String get data_successfully_deleted;
+
+  /// Success message after exporting data
+  ///
+  /// In en, this message translates to:
+  /// **'Data successfully exported'**
+  String get data_successfully_exported;
+
+  /// Success message after importing data
+  ///
+  /// In en, this message translates to:
+  /// **'Data successfully imported'**
+  String get data_successfully_imported;
+
+  /// Date format for days ago
+  ///
+  /// In en, this message translates to:
+  /// **'{count} days ago'**
+  String days_ago(int count);
+
+  /// Delete button text
+  ///
+  /// In en, this message translates to:
+  /// **'Delete'**
+  String get delete;
+
+  /// Confirmation dialog for deleting all data
+  ///
+  /// In en, this message translates to:
+  /// **'Delete all data?'**
+  String get delete_all_data;
+
+  /// Error message when group creation fails
+  ///
+  /// In en, this message translates to:
+  /// **'Error while creating group, please try again'**
+  String get error_creating_group;
+
+  /// Error message when file cannot be read
+  ///
+  /// In en, this message translates to:
+  /// **'Error reading file'**
+  String get error_reading_file;
+
+  /// Message when export is canceled
+  ///
+  /// In en, this message translates to:
+  /// **'Export canceled'**
+  String get export_canceled;
+
+  /// Export data menu item
+  ///
+  /// In en, this message translates to:
+  /// **'Export data'**
+  String get export_data;
+
+  /// Error message for format exceptions
+  ///
+  /// In en, this message translates to:
+  /// **'Format Exception (see console)'**
+  String get format_exception;
+
+  /// Game label
+  ///
+  /// In en, this message translates to:
+  /// **'Game'**
+  String get game;
+
+  /// Placeholder for game name search
+  ///
+  /// In en, this message translates to:
+  /// **'Game Name'**
+  String get game_name;
+
+  /// Group label
+  ///
+  /// In en, this message translates to:
+  /// **'Group'**
+  String get group;
+
+  /// Placeholder for group name input
+  ///
+  /// In en, this message translates to:
+  /// **'Group name'**
+  String get group_name;
+
+  /// Label for groups
+  ///
+  /// In en, this message translates to:
+  /// **'Groups'**
+  String get groups;
+
+  /// Home tab label
+  ///
+  /// In en, this message translates to:
+  /// **'Home'**
+  String get home;
+
+  /// Message when import is canceled
+  ///
+  /// In en, this message translates to:
+  /// **'Import canceled'**
+  String get import_canceled;
+
+  /// Import data menu item
+  ///
+  /// In en, this message translates to:
+  /// **'Import data'**
+  String get import_data;
+
+  /// Info label
+  ///
+  /// In en, this message translates to:
+  /// **'Info'**
+  String get info;
+
+  /// Error message for invalid schema
+  ///
+  /// In en, this message translates to:
+  /// **'Invalid Schema'**
+  String get invalid_schema;
+
+  /// Title for least points ruleset
+  ///
+  /// In en, this message translates to:
+  /// **'Least Points'**
+  String get least_points;
+
+  /// Message when match is in progress
+  ///
+  /// In en, this message translates to:
+  /// **'Match in progress...'**
+  String get match_in_progress;
+
+  /// Placeholder for match name input
+  ///
+  /// In en, this message translates to:
+  /// **'Match name'**
+  String get match_name;
+
+  /// Label for matches
+  ///
+  /// In en, this message translates to:
+  /// **'Matches'**
+  String get matches;
+
+  /// Menu label
+  ///
+  /// In en, this message translates to:
+  /// **'Menu'**
+  String get menu;
+
+  /// Title for most points ruleset
+  ///
+  /// In en, this message translates to:
+  /// **'Most Points'**
+  String get most_points;
+
+  /// Message when no data in the statistic tiles is given
+  ///
+  /// In en, this message translates to:
+  /// **'No data available'**
+  String get no_data_available;
+
+  /// Message when no groups exist
+  ///
+  /// In en, this message translates to:
+  /// **'No groups created yet'**
+  String get no_groups_created_yet;
+
+  /// Message when no matches exist
+  ///
+  /// In en, this message translates to:
+  /// **'No matches created yet'**
+  String get no_matches_created_yet;
+
+  /// Message when no players exist
+  ///
+  /// In en, this message translates to:
+  /// **'No players created yet'**
+  String get no_players_created_yet;
+
+  /// Message when search returns no results
+  ///
+  /// In en, this message translates to:
+  /// **'No players found with that name'**
+  String get no_players_found_with_that_name;
+
+  /// Message when no players are selected
+  ///
+  /// In en, this message translates to:
+  /// **'No players selected'**
+  String get no_players_selected;
+
+  /// Message when no recent matches exist
+  ///
+  /// In en, this message translates to:
+  /// **'No recent matches available'**
+  String get no_recent_matches_available;
+
+  /// Message when no second match exists
+  ///
+  /// In en, this message translates to:
+  /// **'No second match available'**
+  String get no_second_match_available;
+
+  /// Message when no statistics are available, because no matches were played yet
+  ///
+  /// In en, this message translates to:
+  /// **'No statistics available'**
+  String get no_statistics_available;
+
+  /// None option label
+  ///
+  /// In en, this message translates to:
+  /// **'None'**
+  String get none;
+
+  /// None group option label
+  ///
+  /// In en, this message translates to:
+  /// **'None'**
+  String get none_group;
+
+  /// Abbreviation for not available
+  ///
+  /// In en, this message translates to:
+  /// **'Not available'**
+  String get not_available;
+
+  /// Placeholder for player name input
+  ///
+  /// In en, this message translates to:
+  /// **'Player name'**
+  String get player_name;
+
+  /// Players label
+  ///
+  /// In en, this message translates to:
+  /// **'Players'**
+  String get players;
+
+  /// Shows the number of players
+  ///
+  /// In en, this message translates to:
+  /// **'{count} Players'**
+  String players_count(int count);
+
+  /// Title for quick create section
+  ///
+  /// In en, this message translates to:
+  /// **'Quick Create'**
+  String get quick_create;
+
+  /// Title for recent matches section
+  ///
+  /// In en, this message translates to:
+  /// **'Recent Matches'**
+  String get recent_matches;
+
+  /// Ruleset label
+  ///
+  /// In en, this message translates to:
+  /// **'Ruleset'**
+  String get ruleset;
+
+  /// Description for least points ruleset
+  ///
+  /// In en, this message translates to:
+  /// **'Inverse scoring: the player with the fewest points wins.'**
+  String get ruleset_least_points;
+
+  /// Description for most points ruleset
+  ///
+  /// In en, this message translates to:
+  /// **'Traditional ruleset: the player with the most points wins.'**
+  String get ruleset_most_points;
+
+  /// Description for single loser ruleset
+  ///
+  /// In en, this message translates to:
+  /// **'Exactly one loser is determined; last place receives the penalty or consequence.'**
+  String get ruleset_single_loser;
+
+  /// Description for single winner ruleset
+  ///
+  /// In en, this message translates to:
+  /// **'Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.'**
+  String get ruleset_single_winner;
+
+  /// Hint text for group search input field
+  ///
+  /// In en, this message translates to:
+  /// **'Search for groups'**
+  String get search_for_groups;
+
+  /// Hint text for player search input field
+  ///
+  /// In en, this message translates to:
+  /// **'Search for players'**
+  String get search_for_players;
+
+  /// Label to select the winner
+  ///
+  /// In en, this message translates to:
+  /// **'Select Winner:'**
+  String get select_winner;
+
+  /// Shows the number of selected players
+  ///
+  /// In en, this message translates to:
+  /// **'Selected players'**
+  String get selected_players;
+
+  /// Settings label
+  ///
+  /// In en, this message translates to:
+  /// **'Settings'**
+  String get settings;
+
+  /// Title for single loser ruleset
+  ///
+  /// In en, this message translates to:
+  /// **'Single Loser'**
+  String get single_loser;
+
+  /// Title for single winner ruleset
+  ///
+  /// In en, this message translates to:
+  /// **'Single Winner'**
+  String get single_winner;
+
+  /// Statistics tab label
+  ///
+  /// In en, this message translates to:
+  /// **'Statistics'**
+  String get statistics;
+
+  /// Stats tab label (short)
+  ///
+  /// In en, this message translates to:
+  /// **'Stats'**
+  String get stats;
+
+  /// Success message when adding a player
+  ///
+  /// In en, this message translates to:
+  /// **'Successfully added player {playerName}'**
+  String successfully_added_player(String playerName);
+
+  /// Message when search returns no groups
+  ///
+  /// In en, this message translates to:
+  /// **'There is no group matching your search'**
+  String get there_is_no_group_matching_your_search;
+
+  /// Warning message for irreversible actions
+  ///
+  /// In en, this message translates to:
+  /// **'This can\'t be undone'**
+  String get this_cannot_be_undone;
+
+  /// Date format for today
+  ///
+  /// In en, this message translates to:
+  /// **'Today at'**
+  String get today_at;
+
+  /// Undo button text
+  ///
+  /// In en, this message translates to:
+  /// **'Undo'**
+  String get undo;
+
+  /// Error message for unknown exceptions
+  ///
+  /// In en, this message translates to:
+  /// **'Unknown Exception (see console)'**
+  String get unknown_exception;
+
+  /// Winner label
+  ///
+  /// In en, this message translates to:
+  /// **'Winner'**
+  String get winner;
+
+  /// Label for winrate statistic
+  ///
+  /// In en, this message translates to:
+  /// **'Winrate'**
+  String get winrate;
+
+  /// Label for wins statistic
+  ///
+  /// In en, this message translates to:
+  /// **'Wins'**
+  String get wins;
+
+  /// Date format for yesterday
+  ///
+  /// In en, this message translates to:
+  /// **'Yesterday at'**
+  String get yesterday_at;
+}
+
+class _AppLocalizationsDelegate
+    extends LocalizationsDelegate<AppLocalizations> {
+  const _AppLocalizationsDelegate();
+
+  @override
+  Future<AppLocalizations> load(Locale locale) {
+    return SynchronousFuture<AppLocalizations>(lookupAppLocalizations(locale));
+  }
+
+  @override
+  bool isSupported(Locale locale) =>
+      <String>['de', 'en'].contains(locale.languageCode);
+
+  @override
+  bool shouldReload(_AppLocalizationsDelegate old) => false;
+}
+
+AppLocalizations lookupAppLocalizations(Locale locale) {
+  // Lookup logic when only language code is specified.
+  switch (locale.languageCode) {
+    case 'de':
+      return AppLocalizationsDe();
+    case 'en':
+      return AppLocalizationsEn();
+  }
+
+  throw FlutterError(
+    'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
+    'an issue with the localizations generation tool. Please file an issue '
+    'on GitHub with a reproducible sample app and the gen-l10n configuration '
+    'that was used.',
+  );
+}

lib/l10n/generated/app_localizations_de.dart

@@ -0,0 +1,269 @@
+// ignore: unused_import
+import 'package:intl/intl.dart' as intl;
+import 'app_localizations.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for German (`de`).
+class AppLocalizationsDe extends AppLocalizations {
+  AppLocalizationsDe([String locale = 'de']) : super(locale);
+
+  @override
+  String get all_players => 'Alle Spieler:innen';
+
+  @override
+  String get all_players_selected => 'Alle Spieler:innen ausgewählt';
+
+  @override
+  String get amount_of_matches => 'Anzahl der Spiele';
+
+  @override
+  String get app_name => 'Game Tracker';
+
+  @override
+  String get cancel => 'Abbrechen';
+
+  @override
+  String get choose_game => 'Spielvorlage wählen';
+
+  @override
+  String get choose_group => 'Gruppe wählen';
+
+  @override
+  String get choose_ruleset => 'Regelwerk wählen';
+
+  @override
+  String could_not_add_player(Object playerName) {
+    return 'Spieler:in $playerName konnte nicht hinzugefügt werden';
+  }
+
+  @override
+  String get create_group => 'Gruppe erstellen';
+
+  @override
+  String get create_match => 'Spiel erstellen';
+
+  @override
+  String get create_new_group => 'Neue Gruppe erstellen';
+
+  @override
+  String get create_new_match => 'Neues Spiel erstellen';
+
+  @override
+  String get data_successfully_deleted => 'Daten erfolgreich gelöscht';
+
+  @override
+  String get data_successfully_exported => 'Daten erfolgreich exportiert';
+
+  @override
+  String get data_successfully_imported => 'Daten erfolgreich importiert';
+
+  @override
+  String days_ago(int count) {
+    return 'vor $count Tagen';
+  }
+
+  @override
+  String get delete => 'Löschen';
+
+  @override
+  String get delete_all_data => 'Alle Daten löschen?';
+
+  @override
+  String get error_creating_group =>
+      'Fehler beim Erstellen der Gruppe, bitte erneut versuchen';
+
+  @override
+  String get error_reading_file => 'Fehler beim Lesen der Datei';
+
+  @override
+  String get export_canceled => 'Export abgebrochen';
+
+  @override
+  String get export_data => 'Daten exportieren';
+
+  @override
+  String get format_exception => 'Formatfehler (siehe Konsole)';
+
+  @override
+  String get game => 'Spielvorlage';
+
+  @override
+  String get game_name => 'Spielvorlagenname';
+
+  @override
+  String get group => 'Gruppe';
+
+  @override
+  String get group_name => 'Gruppenname';
+
+  @override
+  String get groups => 'Gruppen';
+
+  @override
+  String get home => 'Startseite';
+
+  @override
+  String get import_canceled => 'Import abgebrochen';
+
+  @override
+  String get import_data => 'Daten importieren';
+
+  @override
+  String get info => 'Info';
+
+  @override
+  String get invalid_schema => 'Ungültiges Schema';
+
+  @override
+  String get least_points => 'Niedrigste Punkte';
+
+  @override
+  String get match_in_progress => 'Spiel läuft...';
+
+  @override
+  String get match_name => 'Spieltitel';
+
+  @override
+  String get matches => 'Spiele';
+
+  @override
+  String get menu => 'Menü';
+
+  @override
+  String get most_points => 'Höchste Punkte';
+
+  @override
+  String get no_data_available => 'Keine Daten verfügbar';
+
+  @override
+  String get no_groups_created_yet => 'Noch keine Gruppen erstellt';
+
+  @override
+  String get no_matches_created_yet => 'Noch keine Spiele erstellt';
+
+  @override
+  String get no_players_created_yet => 'Noch keine Spieler:in erstellt';
+
+  @override
+  String get no_players_found_with_that_name =>
+      'Keine Spieler:in mit diesem Namen gefunden';
+
+  @override
+  String get no_players_selected => 'Keine Spieler:innen ausgewählt';
+
+  @override
+  String get no_recent_matches_available => 'Keine letzten Spiele verfügbar';
+
+  @override
+  String get no_second_match_available => 'Kein zweites Spiel verfügbar';
+
+  @override
+  String get no_statistics_available => 'Keine Statistiken verfügbar';
+
+  @override
+  String get none => 'Kein';
+
+  @override
+  String get none_group => 'Keine';
+
+  @override
+  String get not_available => 'Nicht verfügbar';
+
+  @override
+  String get player_name => 'Spieler:innenname';
+
+  @override
+  String get players => 'Spieler:innen';
+
+  @override
+  String players_count(int count) {
+    return '$count Spieler';
+  }
+
+  @override
+  String get quick_create => 'Schnellzugriff';
+
+  @override
+  String get recent_matches => 'Letzte Spiele';
+
+  @override
+  String get ruleset => 'Regelwerk';
+
+  @override
+  String get ruleset_least_points =>
+      'Umgekehrte Wertung: Der/die Spieler:in mit den wenigsten Punkten gewinnt.';
+
+  @override
+  String get ruleset_most_points =>
+      'Traditionelles Regelwerk: Der/die Spieler:in mit den meisten Punkten gewinnt.';
+
+  @override
+  String get ruleset_single_loser =>
+      'Genau ein:e Verlierer:in wird bestimmt; der letzte Platz erhält die Strafe oder Konsequenz.';
+
+  @override
+  String get ruleset_single_winner =>
+      'Genau ein:e Gewinner:in wird gewählt; Unentschieden werden durch einen vordefinierten Tie-Breaker aufgelöst.';
+
+  @override
+  String get search_for_groups => 'Nach Gruppen suchen';
+
+  @override
+  String get search_for_players => 'Nach Spieler:innen suchen';
+
+  @override
+  String get select_winner => 'Gewinner:in wählen:';
+
+  @override
+  String get selected_players => 'Ausgewählte Spieler:innen';
+
+  @override
+  String get settings => 'Einstellungen';
+
+  @override
+  String get single_loser => 'Ein:e Verlierer:in';
+
+  @override
+  String get single_winner => 'Ein:e Gewinner:in';
+
+  @override
+  String get statistics => 'Statistiken';
+
+  @override
+  String get stats => 'Statistiken';
+
+  @override
+  String successfully_added_player(String playerName) {
+    return 'Spieler:in $playerName erfolgreich hinzugefügt';
+  }
+
+  @override
+  String get there_is_no_group_matching_your_search =>
+      'Es gibt keine Gruppe, die deiner Suche entspricht';
+
+  @override
+  String get this_cannot_be_undone =>
+      'Dies kann nicht rückgängig gemacht werden';
+
+  @override
+  String get today_at => 'Heute um';
+
+  @override
+  String get undo => 'Rückgängig';
+
+  @override
+  String get unknown_exception => 'Unbekannter Fehler (siehe Konsole)';
+
+  @override
+  String get winner => 'Gewinner:in';
+
+  @override
+  String get winrate => 'Siegquote';
+
+  @override
+  String get wins => 'Siege';
+
+  @override
+  String get yesterday_at => 'Gestern um';
+}

lib/l10n/generated/app_localizations_en.dart

@@ -0,0 +1,268 @@
+// ignore: unused_import
+import 'package:intl/intl.dart' as intl;
+import 'app_localizations.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for English (`en`).
+class AppLocalizationsEn extends AppLocalizations {
+  AppLocalizationsEn([String locale = 'en']) : super(locale);
+
+  @override
+  String get all_players => 'All players';
+
+  @override
+  String get all_players_selected => 'All players selected';
+
+  @override
+  String get amount_of_matches => 'Amount of Matches';
+
+  @override
+  String get app_name => 'Game Tracker';
+
+  @override
+  String get cancel => 'Cancel';
+
+  @override
+  String get choose_game => 'Choose Game';
+
+  @override
+  String get choose_group => 'Choose Group';
+
+  @override
+  String get choose_ruleset => 'Choose Ruleset';
+
+  @override
+  String could_not_add_player(Object playerName) {
+    return 'Could not add player';
+  }
+
+  @override
+  String get create_group => 'Create Group';
+
+  @override
+  String get create_match => 'Create match';
+
+  @override
+  String get create_new_group => 'Create new group';
+
+  @override
+  String get create_new_match => 'Create new match';
+
+  @override
+  String get data_successfully_deleted => 'Data successfully deleted';
+
+  @override
+  String get data_successfully_exported => 'Data successfully exported';
+
+  @override
+  String get data_successfully_imported => 'Data successfully imported';
+
+  @override
+  String days_ago(int count) {
+    return '$count days ago';
+  }
+
+  @override
+  String get delete => 'Delete';
+
+  @override
+  String get delete_all_data => 'Delete all data?';
+
+  @override
+  String get error_creating_group =>
+      'Error while creating group, please try again';
+
+  @override
+  String get error_reading_file => 'Error reading file';
+
+  @override
+  String get export_canceled => 'Export canceled';
+
+  @override
+  String get export_data => 'Export data';
+
+  @override
+  String get format_exception => 'Format Exception (see console)';
+
+  @override
+  String get game => 'Game';
+
+  @override
+  String get game_name => 'Game Name';
+
+  @override
+  String get group => 'Group';
+
+  @override
+  String get group_name => 'Group name';
+
+  @override
+  String get groups => 'Groups';
+
+  @override
+  String get home => 'Home';
+
+  @override
+  String get import_canceled => 'Import canceled';
+
+  @override
+  String get import_data => 'Import data';
+
+  @override
+  String get info => 'Info';
+
+  @override
+  String get invalid_schema => 'Invalid Schema';
+
+  @override
+  String get least_points => 'Least Points';
+
+  @override
+  String get match_in_progress => 'Match in progress...';
+
+  @override
+  String get match_name => 'Match name';
+
+  @override
+  String get matches => 'Matches';
+
+  @override
+  String get menu => 'Menu';
+
+  @override
+  String get most_points => 'Most Points';
+
+  @override
+  String get no_data_available => 'No data available';
+
+  @override
+  String get no_groups_created_yet => 'No groups created yet';
+
+  @override
+  String get no_matches_created_yet => 'No matches created yet';
+
+  @override
+  String get no_players_created_yet => 'No players created yet';
+
+  @override
+  String get no_players_found_with_that_name =>
+      'No players found with that name';
+
+  @override
+  String get no_players_selected => 'No players selected';
+
+  @override
+  String get no_recent_matches_available => 'No recent matches available';
+
+  @override
+  String get no_second_match_available => 'No second match available';
+
+  @override
+  String get no_statistics_available => 'No statistics available';
+
+  @override
+  String get none => 'None';
+
+  @override
+  String get none_group => 'None';
+
+  @override
+  String get not_available => 'Not available';
+
+  @override
+  String get player_name => 'Player name';
+
+  @override
+  String get players => 'Players';
+
+  @override
+  String players_count(int count) {
+    return '$count Players';
+  }
+
+  @override
+  String get quick_create => 'Quick Create';
+
+  @override
+  String get recent_matches => 'Recent Matches';
+
+  @override
+  String get ruleset => 'Ruleset';
+
+  @override
+  String get ruleset_least_points =>
+      'Inverse scoring: the player with the fewest points wins.';
+
+  @override
+  String get ruleset_most_points =>
+      'Traditional ruleset: the player with the most points wins.';
+
+  @override
+  String get ruleset_single_loser =>
+      'Exactly one loser is determined; last place receives the penalty or consequence.';
+
+  @override
+  String get ruleset_single_winner =>
+      'Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.';
+
+  @override
+  String get search_for_groups => 'Search for groups';
+
+  @override
+  String get search_for_players => 'Search for players';
+
+  @override
+  String get select_winner => 'Select Winner:';
+
+  @override
+  String get selected_players => 'Selected players';
+
+  @override
+  String get settings => 'Settings';
+
+  @override
+  String get single_loser => 'Single Loser';
+
+  @override
+  String get single_winner => 'Single Winner';
+
+  @override
+  String get statistics => 'Statistics';
+
+  @override
+  String get stats => 'Stats';
+
+  @override
+  String successfully_added_player(String playerName) {
+    return 'Successfully added player $playerName';
+  }
+
+  @override
+  String get there_is_no_group_matching_your_search =>
+      'There is no group matching your search';
+
+  @override
+  String get this_cannot_be_undone => 'This can\'t be undone';
+
+  @override
+  String get today_at => 'Today at';
+
+  @override
+  String get undo => 'Undo';
+
+  @override
+  String get unknown_exception => 'Unknown Exception (see console)';
+
+  @override
+  String get winner => 'Winner';
+
+  @override
+  String get winrate => 'Winrate';
+
+  @override
+  String get wins => 'Wins';
+
+  @override
+  String get yesterday_at => 'Yesterday at';
+}

lib/main.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
 import 'package:game_tracker/presentation/views/main_menu/custom_navigation_bar.dart';
 import 'package:provider/provider.dart';
 
@@ -20,22 +21,30 @@ class GameTracker extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
+      localizationsDelegates: AppLocalizations.localizationsDelegates,
+      supportedLocales: AppLocalizations.supportedLocales,
+      localeResolutionCallback: (locale, supportedLocales) {
+        for (final supportedLocale in supportedLocales) {
+          if (supportedLocale.languageCode == locale?.languageCode) {
+            return supportedLocale;
+          }
+        }
+        return supportedLocales.firstWhere(
+          (locale) => locale.languageCode == 'en',
+        );
+      },
       debugShowCheckedModeBanner: false,
-      title: 'Game Tracker',
+      onGenerateTitle: (context) => AppLocalizations.of(context).app_name,
-      darkTheme: ThemeData.dark(),
-
       themeMode: ThemeMode.dark, // forces dark mode
       theme: ThemeData(
         primaryColor: CustomTheme.primaryColor,
         scaffoldBackgroundColor: CustomTheme.backgroundColor,
         appBarTheme: CustomTheme.appBarTheme,
-
         colorScheme: ColorScheme.fromSeed(
           seedColor: CustomTheme.primaryColor,
           brightness: Brightness.dark,
         ).copyWith(surface: CustomTheme.backgroundColor),
       ),
-
       home: const CustomNavigationBar(),
     );
   }

lib/presentation/views/main_menu/custom_navigation_bar.dart

@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/presentation/views/main_menu/game_history_view.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/views/main_menu/groups_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/groups_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/home_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/match_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/settings_view.dart';
 import 'package:game_tracker/presentation/views/main_menu/statistics_view.dart';
 import 'package:game_tracker/presentation/widgets/navbar_item.dart';
@@ -16,36 +17,51 @@ class CustomNavigationBar extends StatefulWidget {
 
 class _CustomNavigationBarState extends State<CustomNavigationBar>
     with SingleTickerProviderStateMixin {
+  /// Currently selected tab index
   int currentIndex = 0;
-  final List<Widget> tabs = [
-    const HomeView(),
-    const GameHistoryView(),
-    const GroupsView(),
-    const StatisticsView(),
-  ];
 
-  @override
+  /// Key count to force rebuild of tab views
-  void initState() {
+  int tabKeyCount = 0;
-    super.initState();
-  }
 
   @override
   Widget build(BuildContext context) {
+    final loc = AppLocalizations.of(context);
+    // Pretty ugly but works
+    final List<Widget> tabs = [
+      KeyedSubtree(key: ValueKey('home_$tabKeyCount'), child: const HomeView()),
+      KeyedSubtree(
+        key: ValueKey('matches_$tabKeyCount'),
+        child: const MatchView(),
+      ),
+      KeyedSubtree(
+        key: ValueKey('groups_$tabKeyCount'),
+        child: const GroupsView(),
+      ),
+      KeyedSubtree(
+        key: ValueKey('stats_$tabKeyCount'),
+        child: const StatisticsView(),
+      ),
+    ];
     return Scaffold(
       appBar: AppBar(
         centerTitle: true,
         title: Text(
-          _currentTabTitle(),
+          _currentTabTitle(context),
           style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
         ),
         backgroundColor: CustomTheme.backgroundColor,
         scrolledUnderElevation: 0,
         actions: [
           IconButton(
-            onPressed: () => Navigator.push(
+            onPressed: () async {
-              context,
+              await Navigator.push(
-              MaterialPageRoute(builder: (_) => const SettingsView()),
+                context,
-            ),
+                MaterialPageRoute(builder: (_) => const SettingsView()),
+              );
+              setState(() {
+                tabKeyCount++;
+              });
+            },
             icon: const Icon(Icons.settings),
           ),
         ],
@@ -54,12 +70,14 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
       backgroundColor: CustomTheme.backgroundColor,
       body: tabs[currentIndex],
       extendBody: true,
-      bottomNavigationBar: Padding(
+      bottomNavigationBar: SafeArea(
-        padding: const EdgeInsets.only(left: 12.0, right: 12.0, bottom: 8.0),
+        minimum: const EdgeInsets.only(bottom: 30),
-        child: Material(
+        child: Container(
-          elevation: 10,
+          margin: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 10),
-          borderRadius: BorderRadius.circular(24),
+          decoration: BoxDecoration(
-          color: CustomTheme.primaryColor,
+            borderRadius: BorderRadius.circular(24),
+            color: CustomTheme.primaryColor,
+          ),
           child: ClipRRect(
             borderRadius: BorderRadius.circular(24),
             child: SizedBox(
@@ -71,28 +89,28 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
                     index: 0,
                     isSelected: currentIndex == 0,
                     icon: Icons.home_rounded,
-                    label: 'Home',
+                    label: loc.home,
                     onTabTapped: onTabTapped,
                   ),
                   NavbarItem(
                     index: 1,
                     isSelected: currentIndex == 1,
                     icon: Icons.gamepad_rounded,
-                    label: 'Games',
+                    label: loc.matches,
                     onTabTapped: onTabTapped,
                   ),
                   NavbarItem(
                     index: 2,
                     isSelected: currentIndex == 2,
                     icon: Icons.group_rounded,
-                    label: 'Groups',
+                    label: loc.groups,
                     onTabTapped: onTabTapped,
                   ),
                   NavbarItem(
                     index: 3,
                     isSelected: currentIndex == 3,
                     icon: Icons.bar_chart_rounded,
-                    label: 'Stats',
+                    label: loc.statistics,
                     onTabTapped: onTabTapped,
                   ),
                 ],
@@ -104,22 +122,25 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
     );
   }
 
+  /// Handles tab tap events. Updates the current [index] state.
   void onTabTapped(int index) {
     setState(() {
       currentIndex = index;
     });
   }
 
-  String _currentTabTitle() {
+  /// Returns the title of the current tab based on [currentIndex].
+  String _currentTabTitle(context) {
+    final loc = AppLocalizations.of(context);
     switch (currentIndex) {
       case 0:
-        return 'Home';
+        return loc.home;
       case 1:
-        return 'Game History';
+        return loc.matches;
       case 2:
-        return 'Groups';
+        return loc.groups;
       case 3:
-        return 'Statistics';
+        return loc.statistics;
       default:
         return '';
     }