Merge remote-tracking branch 'origin/development' into feature/119-implementierung-der-games

# Conflicts:
#	lib/presentation/widgets/text_input/text_input_field.dart

.gitea/workflows/pull_request.yaml

@@ -10,22 +10,22 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # Required for Flutter action
       - name: Install jq
         run: |
           apt-get update
           apt-get install -y jq 
 
-      - name: Set up Flutter
+      - name: Install Flutter (wget)
-        uses: subosito/flutter-action@v2
+        run: |
-        with:
+          wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-          channel: stable
+          tar xf flutter_linux_3.38.2-stable.tar.xz
-          flutter-version: 3.38.6
+          # 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: |
+        run: flutter pub get
-          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
-          flutter pub get
 
       - name: Analyze Formatting
         run: flutter analyze lib test
@@ -36,22 +36,22 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # Required for Flutter action
+      - name: Install dependencies
-      - name: Install jq
         run: |
           apt-get update
           apt-get install -y jq 
 
-      - name: Set up Flutter
+      - name: Install Flutter (wget)
-        uses: subosito/flutter-action@v2
+        run: |
-        with:
+          wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-          channel: stable
+          tar xf flutter_linux_3.38.2-stable.tar.xz
-          flutter-version: 3.38.6
+          # 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: |
+        run: flutter pub get
-          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
-          flutter pub get
 
       - name: Run tests
         run: flutter test

.gitea/workflows/push.yaml

@@ -7,194 +7,44 @@ on:
       - "main"
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Java (Temurin 17)
-        uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: '17'
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-
-      # Required for Flutter action
-      - name: Install jq
-        run: |
-          apt-get update
-          apt-get install -y jq 
-
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-          flutter-version: 3.38.6
-
-      - name: Get dependencies
-        run: |
-          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
-          flutter pub get
-
-      - name: Build APK
-        run: flutter build apk --release
-  
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      # Required for Flutter action
-      - name: Install jq
-        run: |
-          apt-get update
-          apt-get install -y jq 
-
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-          flutter-version: 3.38.6
-
-      - name: Get dependencies
-        run: |
-          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
-          flutter pub get
-
-      - name: Run tests
-        run: flutter test
-
-  update_version:
-    runs-on: ubuntu-latest
-    if: gitea.ref == 'refs/heads/development'
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.BOT_TOKEN }}
-          ref: ${{ gitea.ref_name }}
-
-      - name: Increment version number
-        uses: stikkyapp/update-pubspec-version@v2
-        with:
-          strategy: 'patch'
-          path: './pubspec.yaml'
-
-      - name: Commit version update
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-        run: |
-          git config --global user.name "Gitea Actions [bot]"
-          git config --global user.email "actions@yannick-weigert.de"
-          git config pull.rebase false
-          git pull origin ${{ gitea.ref_name }}
-          git add pubspec.yaml
-          git commit -m "Updated version number [skip ci]"
-          git push origin HEAD:${{ gitea.ref_name }}
-
-  generate_licenses:
-    runs-on: ubuntu-latest
-    needs: update_version
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.BOT_TOKEN }}
-          ref: ${{ gitea.ref_name }}
-
-      # Required for Flutter action
-      - name: Install jq
-        run: |
-          apt-get update
-          apt-get install -y jq 
-
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-          flutter-version: 3.38.6
-
-      - name: Get dependencies
-        run: |
-          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
-          flutter pub get
-
-      - name: Generate oss_licenses.dart
-        run: flutter pub run dart_pubspec_licenses:generate -o lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
-
-      - name: Commit license update
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-        run: |
-          if [ -n "$(git status --porcelain lib test)" ]; then
-            git config --global user.name "Gitea Actions [bot]"
-            git config --global user.email "actions@yannick-weigert.de"
-            git config pull.rebase false
-            git pull origin ${{ gitea.ref_name }}
-            git add lib test
-            git commit -m "Updated licenses [skip ci]"
-            git push origin HEAD:${{ gitea.ref_name }}
-          else
-            echo "No changes to commit"
-          fi
-
   format:
     runs-on: ubuntu-latest
-    needs: [update_version, generate_licenses]
+    if: false # Needs bot user
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # Required for Flutter action
+      - name: Install dependencies
-      - name: Install jq
         run: |
           apt-get update
           apt-get install -y jq 
 
-      - name: Set up Flutter
+      - name: Install Flutter (wget)
-        uses: subosito/flutter-action@v2
+        run: |
-        with:
+          wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
-          channel: stable
+          tar xf flutter_linux_3.38.2-stable.tar.xz
-          flutter-version: 3.38.6
+          # Set Git safe directory for Flutter path
-
+          git config --global --add safe.directory "$(pwd)/flutter"
-      - name: Get dependencies
+          # Set Flutter path
+          echo "$(pwd)/flutter/bin" >> $GITHUB_PATH
+
+      - name: Get & upgrade dependencies
         run: |
-          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
           flutter pub get
+          flutter pub upgrade --major-versions
 
-      - name: Check code format
+      - name: Auto-format
-        id: check_format
-        continue-on-error: true
-        run: flutter analyze lib test
-
-      - name: Format code
-        if: steps.check_format.outcome == 'failure'
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
         run: |
-          git fetch origin ${{ gitea.ref_name }}
+          dart format lib
-          git checkout ${{ gitea.ref_name }}
-          
           dart fix --apply lib 
-          dart fix --apply test
 
-          if [ -n "$(git status --porcelain lib test)" ]; then
+        # Needs credentials, push access and the right files need to be staged
-            git config --global user.name "Gitea Actions [bot]"
+      - name: Commit Changes
-            git config --global user.email "actions@yannick-weigert.de"
+        run: |
-            git config pull.rebase false
+          git config --global user.name "Gitea Actions"
-            git pull origin ${{ gitea.ref_name }}
+          git config --global user.email "actions@gitea.com"
-            git add lib test
+         git status
-            git commit -m "Auto-format code [skip ci]"
+          git add lib/
-            git push origin HEAD:${{ gitea.ref_name }}
+          git status
-          else
+          git commit -m "Actions: Auto-formatting [skip ci]"
-            echo "No changes to commit"
+          git push
-          fi
-
-      - name: Verify format
-        run: flutter analyze lib test

CONTRIBUTING.md

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

LICENSE

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

README.md

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

android/app/build.gradle.kts

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

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
     <application
-        android:label="Tallee"
+        android:label="game_tracker"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

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

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

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

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

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

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

ios/Runner.xcodeproj/project.pbxproj

@@ -152,6 +152,7 @@
 				B68CF4A64F0B5E45B43D6900 /* Pods-RunnerTests.release.xcconfig */,
 				E754D1191B3E54E52B6DCC49 /* Pods-RunnerTests.profile.xcconfig */,
 			);
+			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -477,7 +478,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.liquid.tallee;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -660,7 +661,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.liquid.tallee;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -683,7 +684,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.liquid.tallee;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

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

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

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

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

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

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

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24506" 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="24504"/>
+        <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>
@@ -20,19 +20,12 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Tallee" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m4u-iU-Cmv">
-                                <rect key="frame" x="153" y="747" width="87" height="37"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" name="Futura-Bold" family="Futura" pointSize="28"/>
-                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="LauncherIcon" translatesAutoresizingMaskIntoConstraints="NO" id="ygV-Op-Bu5">
                                 <rect key="frame" x="46" y="334" width="301" height="184"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" name="LauncherColor"/>
+                        <color key="backgroundColor" name="LauncherBackgroundColor"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -43,8 +36,8 @@
     <color key="tintColor" red="0.90196078431372551" green="0.94509803921568625" blue="0.89411764705882346" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
     <resources>
         <image name="LauncherIcon" width="1000" height="1000"/>
-        <namedColor name="LauncherColor">
+        <namedColor name="LauncherBackgroundColor">
-            <color red="0.93699997663497925" green="0.40799999237060547" blue="0.12200000137090683" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.90196078431372551" green="0.94509803921568625" blue="0.89411764705882346" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

ios/Runner/Info.plist

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

lib/core/constants.dart

@@ -19,4 +19,7 @@ class Constants {
 
   /// Maximum length for team names
   static const int MAX_TEAM_NAME_LENGTH = 32;
+
+  /// Maximum length for game descriptions
+  static const int MAX_GAME_DESCRIPTION_LENGTH = 256;
 }

lib/core/custom_theme.dart

@@ -7,28 +7,25 @@ class CustomTheme {
   // ==================== Colors ====================
 
   /// Primary color of the app theme
-  static const Color primaryColor = Color(0xFFef681f);
+  static Color primaryColor = const Color(0xFF7505E4);
 
   /// Secondary color of the app theme
-  static const Color secondaryColor = Color(0xFFf2a981);
+  static Color secondaryColor = const Color(0xFFAFA2FF);
 
   /// Background color of the app theme
-  static const Color backgroundColor = Color(0xFF0B0B0B);
+  static Color backgroundColor = const Color(0xFF0B0B0B);
 
   /// Default color for boxes and containers
-  static const Color boxColor = Color(0xFF101010);
+  static Color boxColor = const Color(0xFF101010);
 
   /// Default border color for boxes and containers
-  static const Color boxBorderColor = Color(0xFF272727);
+  static Color boxBorder = const Color(0xFF272727);
 
   /// Color for boxes and containers displayed on boxes
-  static const Color onBoxColor = Color(0xFF181818);
+  static Color onBoxColor = const Color(0xFF181818);
 
   /// Text color used throughout the app
-  static const Color textColor = Color(0xFFFFFFFF);
+  static const Color textColor = Colors.white;
-
-  /// Background color for the navigation bar
-  static const Color navBarBackgroundColor = Color(0xFF131313);
 
   /// Selected color for the [NavbarItem]
   static Color navBarItemSelectedColor = primaryColor.withGreen(100);
@@ -54,7 +51,7 @@ class CustomTheme {
   // ==================== Decorations ====================
   static BoxDecoration standardBoxDecoration = BoxDecoration(
     color: boxColor,
-    border: Border.all(color: boxBorderColor),
+    border: Border.all(color: boxBorder),
     borderRadius: standardBorderRadiusAll,
   );
 
@@ -66,18 +63,18 @@ class CustomTheme {
   );
 
   // ==================== App Bar Theme ====================
-  static const AppBarTheme appBarTheme = AppBarTheme(
+  static AppBarTheme appBarTheme = AppBarTheme(
     backgroundColor: backgroundColor,
     foregroundColor: textColor,
     elevation: 0,
     scrolledUnderElevation: 0,
     centerTitle: true,
-    titleTextStyle: TextStyle(
+    titleTextStyle: const TextStyle(
       color: textColor,
       fontSize: 20,
       fontWeight: FontWeight.bold,
       overflow: TextOverflow.ellipsis,
     ),
-    iconTheme: IconThemeData(color: textColor),
+    iconTheme: const IconThemeData(color: textColor),
   );
 }

lib/core/enums.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
 
 /// Button types used for styling the [CustomWidthButton]
 /// - [ButtonType.primary]: Primary button style.

lib/data/dao/group_dao.dart

@@ -1,9 +1,9 @@
 import 'package:drift/drift.dart';
-import 'package:tallee/data/db/database.dart';
+import 'package:game_tracker/data/db/database.dart';
-import 'package:tallee/data/db/tables/group_table.dart';
+import 'package:game_tracker/data/db/tables/group_table.dart';
-import 'package:tallee/data/db/tables/player_group_table.dart';
+import 'package:game_tracker/data/db/tables/player_group_table.dart';
-import 'package:tallee/data/dto/group.dart';
+import 'package:game_tracker/data/dto/group.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:game_tracker/data/dto/player.dart';
 
 part 'group_dao.g.dart';
 

lib/data/dao/group_match_dao.dart

@@ -1,7 +1,7 @@
 import 'package:drift/drift.dart';
-import 'package:tallee/data/db/database.dart';
+import 'package:game_tracker/data/db/database.dart';
-import 'package:tallee/data/db/tables/group_match_table.dart';
+import 'package:game_tracker/data/db/tables/group_match_table.dart';
-import 'package:tallee/data/dto/group.dart';
+import 'package:game_tracker/data/dto/group.dart';
 
 part 'group_match_dao.g.dart';
 

lib/data/dao/match_dao.dart

@@ -1,9 +1,9 @@
 import 'package:drift/drift.dart';
-import 'package:tallee/data/db/database.dart';
+import 'package:game_tracker/data/db/database.dart';
-import 'package:tallee/data/db/tables/match_table.dart';
+import 'package:game_tracker/data/db/tables/match_table.dart';
-import 'package:tallee/data/dto/group.dart';
+import 'package:game_tracker/data/dto/group.dart';
-import 'package:tallee/data/dto/match.dart';
+import 'package:game_tracker/data/dto/match.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:game_tracker/data/dto/player.dart';
 
 part 'match_dao.g.dart';
 

lib/data/dao/player_dao.dart

@@ -1,7 +1,7 @@
 import 'package:drift/drift.dart';
-import 'package:tallee/data/db/database.dart';
+import 'package:game_tracker/data/db/database.dart';
-import 'package:tallee/data/db/tables/player_table.dart';
+import 'package:game_tracker/data/db/tables/player_table.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:game_tracker/data/dto/player.dart';
 
 part 'player_dao.g.dart';
 

lib/data/dao/player_group_dao.dart

@@ -1,8 +1,8 @@
 import 'package:drift/drift.dart';
-import 'package:tallee/data/db/database.dart';
+import 'package:game_tracker/data/db/database.dart';
-import 'package:tallee/data/db/tables/player_group_table.dart';
+import 'package:game_tracker/data/db/tables/player_group_table.dart';
-import 'package:tallee/data/db/tables/player_table.dart';
+import 'package:game_tracker/data/db/tables/player_table.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:game_tracker/data/dto/player.dart';
 
 part 'player_group_dao.g.dart';
 

lib/data/dao/player_match_dao.dart

@@ -1,7 +1,7 @@
 import 'package:drift/drift.dart';
-import 'package:tallee/data/db/database.dart';
+import 'package:game_tracker/data/db/database.dart';
-import 'package:tallee/data/db/tables/player_match_table.dart';
+import 'package:game_tracker/data/db/tables/player_match_table.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:game_tracker/data/dto/player.dart';
 
 part 'player_match_dao.g.dart';
 

lib/data/db/database.dart

@@ -1,18 +1,18 @@
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
+import 'package:game_tracker/data/dao/group_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_group_dao.dart';
+import 'package:game_tracker/data/dao/player_match_dao.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/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';
-import 'package:tallee/data/dao/group_dao.dart';
-import 'package:tallee/data/dao/group_match_dao.dart';
-import 'package:tallee/data/dao/match_dao.dart';
-import 'package:tallee/data/dao/player_dao.dart';
-import 'package:tallee/data/dao/player_group_dao.dart';
-import 'package:tallee/data/dao/player_match_dao.dart';
-import 'package:tallee/data/db/tables/group_match_table.dart';
-import 'package:tallee/data/db/tables/group_table.dart';
-import 'package:tallee/data/db/tables/match_table.dart';
-import 'package:tallee/data/db/tables/player_group_table.dart';
-import 'package:tallee/data/db/tables/player_match_table.dart';
-import 'package:tallee/data/db/tables/player_table.dart';
 
 part 'database.g.dart';
 

lib/data/db/database.g.dart

@@ -527,17 +527,6 @@ class $MatchTableTable extends MatchTable
   final GeneratedDatabase attachedDatabase;
   final String? _alias;
   $MatchTableTable(this.attachedDatabase, [this._alias]);
-  static const VerificationMeta _winnerIdMeta = const VerificationMeta(
-    'winnerId',
-  );
-  @override
-  late final GeneratedColumn<String> winnerId = GeneratedColumn<String>(
-    'winner_id',
-    aliasedName,
-    true,
-    type: DriftSqlType.string,
-    requiredDuringInsert: false,
-  );
   static const VerificationMeta _idMeta = const VerificationMeta('id');
   @override
   late final GeneratedColumn<String> id = GeneratedColumn<String>(
@@ -556,6 +545,17 @@ class $MatchTableTable extends MatchTable
     type: DriftSqlType.string,
     requiredDuringInsert: true,
   );
+  static const VerificationMeta _winnerIdMeta = const VerificationMeta(
+    'winnerId',
+  );
+  @override
+  late final GeneratedColumn<String> winnerId = GeneratedColumn<String>(
+    'winner_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
   static const VerificationMeta _createdAtMeta = const VerificationMeta(
     'createdAt',
   );
@@ -568,7 +568,7 @@ class $MatchTableTable extends MatchTable
     requiredDuringInsert: true,
   );
   @override
-  List<GeneratedColumn> get $columns => [winnerId, id, name, createdAt];
+  List<GeneratedColumn> get $columns => [id, name, winnerId, createdAt];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -581,12 +581,6 @@ class $MatchTableTable extends MatchTable
   }) {
     final context = VerificationContext();
     final data = instance.toColumns(true);
-    if (data.containsKey('winner_id')) {
-      context.handle(
-        _winnerIdMeta,
-        winnerId.isAcceptableOrUnknown(data['winner_id']!, _winnerIdMeta),
-      );
-    }
     if (data.containsKey('id')) {
       context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
     } else if (isInserting) {
@@ -600,6 +594,12 @@ class $MatchTableTable extends MatchTable
     } else if (isInserting) {
       context.missing(_nameMeta);
     }
+    if (data.containsKey('winner_id')) {
+      context.handle(
+        _winnerIdMeta,
+        winnerId.isAcceptableOrUnknown(data['winner_id']!, _winnerIdMeta),
+      );
+    }
     if (data.containsKey('created_at')) {
       context.handle(
         _createdAtMeta,
@@ -617,10 +617,6 @@ class $MatchTableTable extends MatchTable
   MatchTableData map(Map<String, dynamic> data, {String? tablePrefix}) {
     final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
     return MatchTableData(
-      winnerId: attachedDatabase.typeMapping.read(
-        DriftSqlType.string,
-        data['${effectivePrefix}winner_id'],
-      ),
       id: attachedDatabase.typeMapping.read(
         DriftSqlType.string,
         data['${effectivePrefix}id'],
@@ -629,6 +625,10 @@ class $MatchTableTable extends MatchTable
         DriftSqlType.string,
         data['${effectivePrefix}name'],
       )!,
+      winnerId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}winner_id'],
+      ),
       createdAt: attachedDatabase.typeMapping.read(
         DriftSqlType.dateTime,
         data['${effectivePrefix}created_at'],
@@ -643,35 +643,35 @@ class $MatchTableTable extends MatchTable
 }
 
 class MatchTableData extends DataClass implements Insertable<MatchTableData> {
-  final String? winnerId;
   final String id;
   final String name;
+  final String? winnerId;
   final DateTime createdAt;
   const MatchTableData({
-    this.winnerId,
     required this.id,
     required this.name,
+    this.winnerId,
     required this.createdAt,
   });
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['name'] = Variable<String>(name);
     if (!nullToAbsent || winnerId != null) {
       map['winner_id'] = Variable<String>(winnerId);
     }
-    map['id'] = Variable<String>(id);
-    map['name'] = Variable<String>(name);
     map['created_at'] = Variable<DateTime>(createdAt);
     return map;
   }
 
   MatchTableCompanion toCompanion(bool nullToAbsent) {
     return MatchTableCompanion(
+      id: Value(id),
+      name: Value(name),
       winnerId: winnerId == null && nullToAbsent
           ? const Value.absent()
           : Value(winnerId),
-      id: Value(id),
-      name: Value(name),
       createdAt: Value(createdAt),
     );
   }
@@ -682,9 +682,9 @@ class MatchTableData extends DataClass implements Insertable<MatchTableData> {
   }) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return MatchTableData(
-      winnerId: serializer.fromJson<String?>(json['winnerId']),
       id: serializer.fromJson<String>(json['id']),
       name: serializer.fromJson<String>(json['name']),
+      winnerId: serializer.fromJson<String?>(json['winnerId']),
       createdAt: serializer.fromJson<DateTime>(json['createdAt']),
     );
   }
@@ -692,29 +692,29 @@ class MatchTableData extends DataClass implements Insertable<MatchTableData> {
   Map<String, dynamic> toJson({ValueSerializer? serializer}) {
     serializer ??= driftRuntimeOptions.defaultSerializer;
     return <String, dynamic>{
-      'winnerId': serializer.toJson<String?>(winnerId),
       'id': serializer.toJson<String>(id),
       'name': serializer.toJson<String>(name),
+      'winnerId': serializer.toJson<String?>(winnerId),
       'createdAt': serializer.toJson<DateTime>(createdAt),
     };
   }
 
   MatchTableData copyWith({
-    Value<String?> winnerId = const Value.absent(),
     String? id,
     String? name,
+    Value<String?> winnerId = const Value.absent(),
     DateTime? createdAt,
   }) => MatchTableData(
-    winnerId: winnerId.present ? winnerId.value : this.winnerId,
     id: id ?? this.id,
     name: name ?? this.name,
+    winnerId: winnerId.present ? winnerId.value : this.winnerId,
     createdAt: createdAt ?? this.createdAt,
   );
   MatchTableData copyWithCompanion(MatchTableCompanion data) {
     return MatchTableData(
-      winnerId: data.winnerId.present ? data.winnerId.value : this.winnerId,
       id: data.id.present ? data.id.value : this.id,
       name: data.name.present ? data.name.value : this.name,
+      winnerId: data.winnerId.present ? data.winnerId.value : this.winnerId,
       createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
     );
   }
@@ -722,75 +722,75 @@ class MatchTableData extends DataClass implements Insertable<MatchTableData> {
   @override
   String toString() {
     return (StringBuffer('MatchTableData(')
-          ..write('winnerId: $winnerId, ')
           ..write('id: $id, ')
           ..write('name: $name, ')
+          ..write('winnerId: $winnerId, ')
           ..write('createdAt: $createdAt')
           ..write(')'))
         .toString();
   }
 
   @override
-  int get hashCode => Object.hash(winnerId, id, name, createdAt);
+  int get hashCode => Object.hash(id, name, winnerId, createdAt);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
       (other is MatchTableData &&
-          other.winnerId == this.winnerId &&
           other.id == this.id &&
           other.name == this.name &&
+          other.winnerId == this.winnerId &&
           other.createdAt == this.createdAt);
 }
 
 class MatchTableCompanion extends UpdateCompanion<MatchTableData> {
-  final Value<String?> winnerId;
   final Value<String> id;
   final Value<String> name;
+  final Value<String?> winnerId;
   final Value<DateTime> createdAt;
   final Value<int> rowid;
   const MatchTableCompanion({
-    this.winnerId = const Value.absent(),
     this.id = const Value.absent(),
     this.name = const Value.absent(),
+    this.winnerId = const Value.absent(),
     this.createdAt = const Value.absent(),
     this.rowid = const Value.absent(),
   });
   MatchTableCompanion.insert({
-    this.winnerId = const Value.absent(),
     required String id,
     required String name,
+    this.winnerId = const Value.absent(),
     required DateTime createdAt,
     this.rowid = const Value.absent(),
   }) : id = Value(id),
        name = Value(name),
        createdAt = Value(createdAt);
   static Insertable<MatchTableData> custom({
-    Expression<String>? winnerId,
     Expression<String>? id,
     Expression<String>? name,
+    Expression<String>? winnerId,
     Expression<DateTime>? createdAt,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
-      if (winnerId != null) 'winner_id': winnerId,
       if (id != null) 'id': id,
       if (name != null) 'name': name,
+      if (winnerId != null) 'winner_id': winnerId,
       if (createdAt != null) 'created_at': createdAt,
       if (rowid != null) 'rowid': rowid,
     });
   }
 
   MatchTableCompanion copyWith({
-    Value<String?>? winnerId,
     Value<String>? id,
     Value<String>? name,
+    Value<String?>? winnerId,
     Value<DateTime>? createdAt,
     Value<int>? rowid,
   }) {
     return MatchTableCompanion(
-      winnerId: winnerId ?? this.winnerId,
       id: id ?? this.id,
       name: name ?? this.name,
+      winnerId: winnerId ?? this.winnerId,
       createdAt: createdAt ?? this.createdAt,
       rowid: rowid ?? this.rowid,
     );
@@ -799,15 +799,15 @@ class MatchTableCompanion extends UpdateCompanion<MatchTableData> {
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
-    if (winnerId.present) {
-      map['winner_id'] = Variable<String>(winnerId.value);
-    }
     if (id.present) {
       map['id'] = Variable<String>(id.value);
     }
     if (name.present) {
       map['name'] = Variable<String>(name.value);
     }
+    if (winnerId.present) {
+      map['winner_id'] = Variable<String>(winnerId.value);
+    }
     if (createdAt.present) {
       map['created_at'] = Variable<DateTime>(createdAt.value);
     }
@@ -820,9 +820,9 @@ class MatchTableCompanion extends UpdateCompanion<MatchTableData> {
   @override
   String toString() {
     return (StringBuffer('MatchTableCompanion(')
-          ..write('winnerId: $winnerId, ')
           ..write('id: $id, ')
           ..write('name: $name, ')
+          ..write('winnerId: $winnerId, ')
           ..write('createdAt: $createdAt, ')
           ..write('rowid: $rowid')
           ..write(')'))
@@ -2339,17 +2339,17 @@ typedef $$GroupTableTableProcessedTableManager =
     >;
 typedef $$MatchTableTableCreateCompanionBuilder =
     MatchTableCompanion Function({
-      Value<String?> winnerId,
       required String id,
       required String name,
+      Value<String?> winnerId,
       required DateTime createdAt,
       Value<int> rowid,
     });
 typedef $$MatchTableTableUpdateCompanionBuilder =
     MatchTableCompanion Function({
-      Value<String?> winnerId,
       Value<String> id,
       Value<String> name,
+      Value<String?> winnerId,
       Value<DateTime> createdAt,
       Value<int> rowid,
     });
@@ -2414,11 +2414,6 @@ class $$MatchTableTableFilterComposer
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  ColumnFilters<String> get winnerId => $composableBuilder(
-    column: $table.winnerId,
-    builder: (column) => ColumnFilters(column),
-  );
-
   ColumnFilters<String> get id => $composableBuilder(
     column: $table.id,
     builder: (column) => ColumnFilters(column),
@@ -2429,6 +2424,11 @@ class $$MatchTableTableFilterComposer
     builder: (column) => ColumnFilters(column),
   );
 
+  ColumnFilters<String> get winnerId => $composableBuilder(
+    column: $table.winnerId,
+    builder: (column) => ColumnFilters(column),
+  );
+
   ColumnFilters<DateTime> get createdAt => $composableBuilder(
     column: $table.createdAt,
     builder: (column) => ColumnFilters(column),
@@ -2494,11 +2494,6 @@ class $$MatchTableTableOrderingComposer
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  ColumnOrderings<String> get winnerId => $composableBuilder(
-    column: $table.winnerId,
-    builder: (column) => ColumnOrderings(column),
-  );
-
   ColumnOrderings<String> get id => $composableBuilder(
     column: $table.id,
     builder: (column) => ColumnOrderings(column),
@@ -2509,6 +2504,11 @@ class $$MatchTableTableOrderingComposer
     builder: (column) => ColumnOrderings(column),
   );
 
+  ColumnOrderings<String> get winnerId => $composableBuilder(
+    column: $table.winnerId,
+    builder: (column) => ColumnOrderings(column),
+  );
+
   ColumnOrderings<DateTime> get createdAt => $composableBuilder(
     column: $table.createdAt,
     builder: (column) => ColumnOrderings(column),
@@ -2524,15 +2524,15 @@ class $$MatchTableTableAnnotationComposer
     super.$addJoinBuilderToRootComposer,
     super.$removeJoinBuilderFromRootComposer,
   });
-  GeneratedColumn<String> get winnerId =>
-      $composableBuilder(column: $table.winnerId, builder: (column) => column);
-
   GeneratedColumn<String> get id =>
       $composableBuilder(column: $table.id, builder: (column) => column);
 
   GeneratedColumn<String> get name =>
       $composableBuilder(column: $table.name, builder: (column) => column);
 
+  GeneratedColumn<String> get winnerId =>
+      $composableBuilder(column: $table.winnerId, builder: (column) => column);
+
   GeneratedColumn<DateTime> get createdAt =>
       $composableBuilder(column: $table.createdAt, builder: (column) => column);
 
@@ -2618,29 +2618,29 @@ class $$MatchTableTableTableManager
               $$MatchTableTableAnnotationComposer($db: db, $table: table),
           updateCompanionCallback:
               ({
-                Value<String?> winnerId = const Value.absent(),
                 Value<String> id = const Value.absent(),
                 Value<String> name = const Value.absent(),
+                Value<String?> winnerId = const Value.absent(),
                 Value<DateTime> createdAt = const Value.absent(),
                 Value<int> rowid = const Value.absent(),
               }) => MatchTableCompanion(
-                winnerId: winnerId,
                 id: id,
                 name: name,
+                winnerId: winnerId,
                 createdAt: createdAt,
                 rowid: rowid,
               ),
           createCompanionCallback:
               ({
-                Value<String?> winnerId = const Value.absent(),
                 required String id,
                 required String name,
+                Value<String?> winnerId = const Value.absent(),
                 required DateTime createdAt,
                 Value<int> rowid = const Value.absent(),
               }) => MatchTableCompanion.insert(
-                winnerId: winnerId,
                 id: id,
                 name: name,
+                winnerId: winnerId,
                 createdAt: createdAt,
                 rowid: rowid,
               ),

lib/data/db/tables/group_match_table.dart

@@ -1,6 +1,6 @@
 import 'package:drift/drift.dart';
-import 'package:tallee/data/db/tables/group_table.dart';
+import 'package:game_tracker/data/db/tables/group_table.dart';
-import 'package:tallee/data/db/tables/match_table.dart';
+import 'package:game_tracker/data/db/tables/match_table.dart';
 
 class GroupMatchTable extends Table {
   TextColumn get groupId =>

lib/data/db/tables/player_group_table.dart

@@ -1,6 +1,6 @@
 import 'package:drift/drift.dart';
-import 'package:tallee/data/db/tables/group_table.dart';
+import 'package:game_tracker/data/db/tables/group_table.dart';
-import 'package:tallee/data/db/tables/player_table.dart';
+import 'package:game_tracker/data/db/tables/player_table.dart';
 
 class PlayerGroupTable extends Table {
   TextColumn get playerId =>

lib/data/db/tables/player_match_table.dart

@@ -1,6 +1,6 @@
 import 'package:drift/drift.dart';
-import 'package:tallee/data/db/tables/match_table.dart';
+import 'package:game_tracker/data/db/tables/match_table.dart';
-import 'package:tallee/data/db/tables/player_table.dart';
+import 'package:game_tracker/data/db/tables/player_table.dart';
 
 class PlayerMatchTable extends Table {
   TextColumn get playerId =>

lib/data/dto/game.dart

@@ -0,0 +1,23 @@
+import 'package:clock/clock.dart';
+import 'package:uuid/uuid.dart';
+
+class Game {
+  final String id;
+  final DateTime createdAt;
+  final String name;
+  final String? ruleset;
+  final String? description;
+  final int? color;
+  final String? icon;
+
+  Game({
+    String? id,
+    DateTime? createdAt,
+    required this.name,
+    this.ruleset,
+    this.description,
+    this.color,
+    this.icon,
+  })  : id = id ?? const Uuid().v4(),
+        createdAt = createdAt ?? clock.now();
+}

lib/data/dto/group.dart

@@ -1,5 +1,5 @@
 import 'package:clock/clock.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:game_tracker/data/dto/player.dart';
 import 'package:uuid/uuid.dart';
 
 class Group {

lib/data/dto/match.dart

@@ -1,6 +1,6 @@
 import 'package:clock/clock.dart';
-import 'package:tallee/data/dto/group.dart';
+import 'package:game_tracker/data/dto/group.dart';
-import 'package:tallee/data/dto/player.dart';
+import 'package:game_tracker/data/dto/player.dart';
 import 'package:uuid/uuid.dart';
 
 class Match {

lib/l10n/arb/app_de.arb

@@ -3,13 +3,14 @@
   "all_players": "Alle Spieler:innen",
   "all_players_selected": "Alle Spieler:innen ausgewählt",
   "amount_of_matches": "Anzahl der Spiele",
-  "app_name": "Tallee",
+  "app_name": "Game Tracker",
   "best_player": "Beste:r Spieler:in",
   "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_game": "Spielvorlage erstellen",
   "create_group": "Gruppe erstellen",
   "create_match": "Spiel erstellen",
   "create_new_group": "Neue Gruppe erstellen",
@@ -22,15 +23,12 @@
   "days_ago": "vor {count} Tagen",
   "delete": "Löschen",
   "delete_all_data": "Alle Daten löschen",
-  "delete_group": "Diese Gruppe löschen",
+  "delete_game": "Spielvorlage löschen",
-  "edit_group": "Gruppe bearbeiten",
   "delete_group": "Gruppe löschen",
-  "delete_match": "Spiel löschen",
+  "description": "Beschreibung",
+  "edit_game": "Spielvorlage bearbeiten",
   "edit_group": "Gruppe bearbeiten",
-  "enter_results": "Ergebnisse eintragen",
   "error_creating_group": "Fehler beim Erstellen der Gruppe, bitte erneut versuchen",
-  "error_deleting_group": "Fehler beim Löschen der Gruppe, bitte erneut versuchen",
-  "error_editing_group": "Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen",
   "error_reading_file": "Fehler beim Lesen der Datei",
   "export_canceled": "Export abgebrochen",
   "export_data": "Daten exportieren",
@@ -52,7 +50,6 @@
   "licenses": "Lizenzen",
   "match_in_progress": "Spiel läuft...",
   "match_name": "Spieltitel",
-  "match_profile": "Spielprofil",
   "matches": "Spiele",
   "members": "Mitglieder",
   "most_points": "Höchste Punkte",
@@ -65,7 +62,6 @@
   "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_results_entered_yet": "Noch keine Ergebnisse eingetragen",
   "no_second_match_available": "Kein zweites Spiel verfügbar",
   "no_statistics_available": "Keine Statistiken verfügbar",
   "none": "Kein",
@@ -78,14 +74,11 @@
   "privacy_policy": "Datenschutzerklärung",
   "quick_create": "Schnellzugriff",
   "recent_matches": "Letzte Spiele",
-  "result": "Ergebnis",
-  "results": "Ergebnisse",
   "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.",
-  "save_changes": "Änderungen speichern",
   "search_for_groups": "Nach Gruppen suchen",
   "search_for_players": "Nach Spieler:innen suchen",
   "select_winner": "Gewinner:in wählen:",

lib/l10n/arb/app_en.arb

@@ -30,6 +30,9 @@
   "@could_not_add_player": {
     "description": "Error message when adding a player fails"
   },
+  "@create_game": {
+    "description": "Button text to create a game"
+  },
   "@create_group": {
     "description": "Button text to create a group"
   },
@@ -37,10 +40,10 @@
     "description": "Button text to create a match"
   },
   "@create_new_group": {
-    "description": "Appbar text to create a new group"
+    "description": "Button text to create a new group"
   },
   "@create_new_match": {
-    "description": "Appbar text to create a new match"
+    "description": "Button text to create a new match"
   },
   "@created_on": {
     "description": "Label for creation date"
@@ -71,27 +74,24 @@
   "@delete_all_data": {
     "description": "Confirmation dialog for deleting all data"
   },
+  "@delete_game": {
+    "description": "Button text to delete a game"
+  },
   "@delete_group": {
-    "description": "Confirmation dialog for deleting a group"
+    "description": "Button text to delete a group"
   },
-  "@delete_match": {
+  "description": {
-    "description": "Button text to delete a match"
+    "description": "Description label"
   },
+  "edit_game": {
+    "description": "Button text to edit a game"
+   },
   "@edit_group": {
-      "description": "Button & Appbar label for editing a group"
+    "description": "Button text to edit a group"
-  },
-  "@enter_results": {
-    "description": "Button text to enter match results"
   },
   "@error_creating_group": {
     "description": "Error message when group creation fails"
   },
-  "@error_deleting_group": {
-      "description": "Error message when group deletion fails"
-  },
-  "@error_editing_group": {
-      "description": "Error message when group editing fails"
-  },
   "@error_reading_file": {
     "description": "Error message when file cannot be read"
   },
@@ -155,9 +155,6 @@
   "@match_name": {
     "description": "Placeholder for match name input"
   },
-  "@match_profile": {
-    "description": "Title for match profile view"
-  },
   "@matches": {
     "description": "Label for matches"
   },
@@ -194,9 +191,6 @@
   "@no_recent_matches_available": {
     "description": "Message when no recent matches exist"
   },
-  "@no_results_entered_yet": {
-    "description": "Message when no results have been entered yet"
-  },
   "@no_second_match_available": {
     "description": "Message when no second match exists"
   },
@@ -238,9 +232,6 @@
   "@recent_matches": {
     "description": "Title for recent matches section"
   },
-  "@results": {
-    "description": "Label for match results"
-  },
   "@ruleset": {
     "description": "Ruleset label"
   },
@@ -256,9 +247,6 @@
   "@ruleset_single_winner": {
     "description": "Description for single winner ruleset"
   },
-  "@save_changes": {
-    "description": "Save changes button text"
-  },
   "@search_for_groups": {
     "description": "Hint text for group search input field"
   },
@@ -325,13 +313,14 @@
   "all_players": "All players",
   "all_players_selected": "All players selected",
   "amount_of_matches": "Amount of Matches",
-  "app_name": "Tallee",
+  "app_name": "Game Tracker",
   "best_player": "Best Player",
   "cancel": "Cancel",
   "choose_game": "Choose Game",
   "choose_group": "Choose Group",
   "choose_ruleset": "Choose Ruleset",
   "could_not_add_player": "Could not add player",
+  "create_game": "Create Game",
   "create_group": "Create Group",
   "create_match": "Create match",
   "create_new_group": "Create new group",
@@ -344,13 +333,12 @@
   "days_ago": "{count} days ago",
   "delete": "Delete",
   "delete_all_data": "Delete all data",
+  "delete_game": "Delete Game",
   "delete_group": "Delete Group",
-  "delete_match": "Delete Match",
+  "description": "Description",
+  "edit_game": "Edit Game",
   "edit_group": "Edit Group",
-  "enter_results": "Enter Results",
   "error_creating_group": "Error while creating group, please try again",
-  "error_deleting_group": "Error while deleting group, please try again",
-  "error_editing_group": "Error while editing group, please try again",
   "error_reading_file": "Error reading file",
   "export_canceled": "Export canceled",
   "export_data": "Export data",
@@ -372,7 +360,6 @@
   "licenses": "Licenses",
   "match_in_progress": "Match in progress...",
   "match_name": "Match name",
-  "match_profile": "Match Profile",
   "matches": "Matches",
   "members": "Members",
   "most_points": "Most Points",
@@ -385,7 +372,6 @@
   "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_results_entered_yet": "No results entered yet",
   "no_second_match_available": "No second match available",
   "no_statistics_available": "No statistics available",
   "none": "None",
@@ -398,13 +384,11 @@
   "privacy_policy": "Privacy Policy",
   "quick_create": "Quick Create",
   "recent_matches": "Recent Matches",
-  "results": "Results",
   "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.",
-  "save_changes": "Save Changes",
   "search_for_groups": "Search for groups",
   "search_for_players": "Search for players",
   "select_winner": "Select Winner:",

lib/l10n/generated/app_localizations.dart

@@ -98,6 +98,18 @@ abstract class AppLocalizations {
     Locale('en'),
   ];
 
+  /// No description provided for @description.
+  ///
+  /// In en, this message translates to:
+  /// **'Description'**
+  String get description;
+
+  /// No description provided for @edit_game.
+  ///
+  /// In en, this message translates to:
+  /// **'Edit Game'**
+  String get edit_game;
+
   /// Label for all players list
   ///
   /// In en, this message translates to:
@@ -119,7 +131,7 @@ abstract class AppLocalizations {
   /// The name of the App
   ///
   /// In en, this message translates to:
-  /// **'Tallee'**
+  /// **'Game Tracker'**
   String get app_name;
 
   /// Label for best player statistic
@@ -158,6 +170,12 @@ abstract class AppLocalizations {
   /// **'Could not add player'**
   String could_not_add_player(Object playerName);
 
+  /// Button text to create a game
+  ///
+  /// In en, this message translates to:
+  /// **'Create Game'**
+  String get create_game;
+
   /// Button text to create a group
   ///
   /// In en, this message translates to:
@@ -170,7 +188,7 @@ abstract class AppLocalizations {
   /// **'Create match'**
   String get create_match;
 
-  /// Appbar text to create a new group
+  /// Button text to create a new group
   ///
   /// In en, this message translates to:
   /// **'Create new group'**
@@ -182,7 +200,7 @@ abstract class AppLocalizations {
   /// **'Created on'**
   String get created_on;
 
-  /// Appbar text to create a new match
+  /// Button text to create a new match
   ///
   /// In en, this message translates to:
   /// **'Create new match'**
@@ -230,48 +248,30 @@ abstract class AppLocalizations {
   /// **'Delete all data'**
   String get delete_all_data;
 
-  /// Confirmation dialog for deleting a group
+  /// Button text to delete a game
+  ///
+  /// In en, this message translates to:
+  /// **'Delete Game'**
+  String get delete_game;
+
+  /// Button text to delete a group
   ///
   /// In en, this message translates to:
   /// **'Delete Group'**
   String get delete_group;
 
-  /// Button text to delete a match
+  /// Button text to edit a group
-  ///
-  /// In en, this message translates to:
-  /// **'Delete Match'**
-  String get delete_match;
-
-  /// Button & Appbar label for editing a group
   ///
   /// In en, this message translates to:
   /// **'Edit Group'**
   String get edit_group;
 
-  /// Button text to enter match results
-  ///
-  /// In en, this message translates to:
-  /// **'Enter Results'**
-  String get enter_results;
-
   /// 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 group deletion fails
-  ///
-  /// In en, this message translates to:
-  /// **'Error while deleting group, please try again'**
-  String get error_deleting_group;
-
-  /// Error message when group editing fails
-  ///
-  /// In en, this message translates to:
-  /// **'Error while editing group, please try again'**
-  String get error_editing_group;
-
   /// Error message when file cannot be read
   ///
   /// In en, this message translates to:
@@ -398,12 +398,6 @@ abstract class AppLocalizations {
   /// **'Match name'**
   String get match_name;
 
-  /// Title for match profile view
-  ///
-  /// In en, this message translates to:
-  /// **'Match Profile'**
-  String get match_profile;
-
   /// Label for matches
   ///
   /// In en, this message translates to:
@@ -476,12 +470,6 @@ abstract class AppLocalizations {
   /// **'No recent matches available'**
   String get no_recent_matches_available;
 
-  /// Message when no results have been entered yet
-  ///
-  /// In en, this message translates to:
-  /// **'No results entered yet'**
-  String get no_results_entered_yet;
-
   /// Message when no second match exists
   ///
   /// In en, this message translates to:
@@ -554,12 +542,6 @@ abstract class AppLocalizations {
   /// **'Recent Matches'**
   String get recent_matches;
 
-  /// Label for match results
-  ///
-  /// In en, this message translates to:
-  /// **'Results'**
-  String get results;
-
   /// Ruleset label
   ///
   /// In en, this message translates to:
@@ -590,12 +572,6 @@ abstract class AppLocalizations {
   /// **'Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.'**
   String get ruleset_single_winner;
 
-  /// Save changes button text
-  ///
-  /// In en, this message translates to:
-  /// **'Save Changes'**
-  String get save_changes;
-
   /// Hint text for group search input field
   ///
   /// In en, this message translates to:

lib/l10n/generated/app_localizations_de.dart

@@ -8,6 +8,12 @@ import 'app_localizations.dart';
 class AppLocalizationsDe extends AppLocalizations {
   AppLocalizationsDe([String locale = 'de']) : super(locale);
 
+  @override
+  String get description => 'Beschreibung';
+
+  @override
+  String get edit_game => 'Spielvorlage bearbeiten';
+
   @override
   String get all_players => 'Alle Spieler:innen';
 
@@ -18,7 +24,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get amount_of_matches => 'Anzahl der Spiele';
 
   @override
-  String get app_name => 'Tallee';
+  String get app_name => 'Game Tracker';
 
   @override
   String get best_player => 'Beste:r Spieler:in';
@@ -40,6 +46,9 @@ class AppLocalizationsDe extends AppLocalizations {
     return 'Spieler:in $playerName konnte nicht hinzugefügt werden';
   }
 
+  @override
+  String get create_game => 'Spielvorlage erstellen';
+
   @override
   String get create_group => 'Gruppe erstellen';
 
@@ -79,29 +88,18 @@ class AppLocalizationsDe extends AppLocalizations {
   String get delete_all_data => 'Alle Daten löschen';
 
   @override
-  String get delete_group => 'Gruppe löschen';
+  String get delete_game => 'Spielvorlage löschen';
 
   @override
-  String get delete_match => 'Spiel löschen';
+  String get delete_group => 'Gruppe löschen';
 
   @override
   String get edit_group => 'Gruppe bearbeiten';
 
-  @override
-  String get enter_results => 'Ergebnisse eintragen';
-
   @override
   String get error_creating_group =>
       'Fehler beim Erstellen der Gruppe, bitte erneut versuchen';
 
-  @override
-  String get error_deleting_group =>
-      'Fehler beim Löschen der Gruppe, bitte erneut versuchen';
-
-  @override
-  String get error_editing_group =>
-      'Fehler beim Bearbeiten der Gruppe, bitte erneut versuchen';
-
   @override
   String get error_reading_file => 'Fehler beim Lesen der Datei';
 
@@ -165,9 +163,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get match_name => 'Spieltitel';
 
-  @override
-  String get match_profile => 'Spielprofil';
-
   @override
   String get matches => 'Spiele';
 
@@ -205,9 +200,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get no_recent_matches_available => 'Keine letzten Spiele verfügbar';
 
-  @override
-  String get no_results_entered_yet => 'Noch keine Ergebnisse eingetragen';
-
   @override
   String get no_second_match_available => 'Kein zweites Spiel verfügbar';
 
@@ -246,9 +238,6 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get recent_matches => 'Letzte Spiele';
 
-  @override
-  String get results => 'Ergebnisse';
-
   @override
   String get ruleset => 'Regelwerk';
 
@@ -268,9 +257,6 @@ class AppLocalizationsDe extends AppLocalizations {
   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 save_changes => 'Änderungen speichern';
-
   @override
   String get search_for_groups => 'Nach Gruppen suchen';
 

lib/l10n/generated/app_localizations_en.dart

@@ -8,6 +8,12 @@ import 'app_localizations.dart';
 class AppLocalizationsEn extends AppLocalizations {
   AppLocalizationsEn([String locale = 'en']) : super(locale);
 
+  @override
+  String get description => 'Description';
+
+  @override
+  String get edit_game => 'Edit Game';
+
   @override
   String get all_players => 'All players';
 
@@ -18,7 +24,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get amount_of_matches => 'Amount of Matches';
 
   @override
-  String get app_name => 'Tallee';
+  String get app_name => 'Game Tracker';
 
   @override
   String get best_player => 'Best Player';
@@ -40,6 +46,9 @@ class AppLocalizationsEn extends AppLocalizations {
     return 'Could not add player';
   }
 
+  @override
+  String get create_game => 'Create Game';
+
   @override
   String get create_group => 'Create Group';
 
@@ -79,29 +88,18 @@ class AppLocalizationsEn extends AppLocalizations {
   String get delete_all_data => 'Delete all data';
 
   @override
-  String get delete_group => 'Delete Group';
+  String get delete_game => 'Delete Game';
 
   @override
-  String get delete_match => 'Delete Match';
+  String get delete_group => 'Delete Group';
 
   @override
   String get edit_group => 'Edit Group';
 
-  @override
-  String get enter_results => 'Enter Results';
-
   @override
   String get error_creating_group =>
       'Error while creating group, please try again';
 
-  @override
-  String get error_deleting_group =>
-      'Error while deleting group, please try again';
-
-  @override
-  String get error_editing_group =>
-      'Error while editing group, please try again';
-
   @override
   String get error_reading_file => 'Error reading file';
 
@@ -165,9 +163,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get match_name => 'Match name';
 
-  @override
-  String get match_profile => 'Match Profile';
-
   @override
   String get matches => 'Matches';
 
@@ -205,9 +200,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get no_recent_matches_available => 'No recent matches available';
 
-  @override
-  String get no_results_entered_yet => 'No results entered yet';
-
   @override
   String get no_second_match_available => 'No second match available';
 
@@ -246,9 +238,6 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get recent_matches => 'Recent Matches';
 
-  @override
-  String get results => 'Results';
-
   @override
   String get ruleset => 'Ruleset';
 
@@ -268,9 +257,6 @@ class AppLocalizationsEn extends AppLocalizations {
   String get ruleset_single_winner =>
       'Exactly one winner is chosen; ties are resolved by a predefined tiebreaker.';
 
-  @override
-  String get save_changes => 'Save Changes';
-
   @override
   String get search_for_groups => 'Search for groups';
 

lib/main.dart

@@ -1,9 +1,9 @@
 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';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/custom_navigation_bar.dart';
 
 void main() {
   runApp(
@@ -40,22 +40,10 @@ class GameTracker extends StatelessWidget {
         primaryColor: CustomTheme.primaryColor,
         scaffoldBackgroundColor: CustomTheme.backgroundColor,
         appBarTheme: CustomTheme.appBarTheme,
-        radioTheme: RadioThemeData(
-          fillColor: WidgetStateProperty.resolveWith<Color>((states) {
-            if (states.contains(WidgetState.selected)) {
-              return CustomTheme.primaryColor;
-            }
-            return CustomTheme.textColor;
-          }),
-        ),
         colorScheme: ColorScheme.fromSeed(
           seedColor: CustomTheme.primaryColor,
           brightness: Brightness.dark,
-          primary: CustomTheme.primaryColor,
+        ).copyWith(surface: CustomTheme.backgroundColor),
-          onPrimary: CustomTheme.textColor,
-          surface: CustomTheme.backgroundColor,
-          onSurface: CustomTheme.textColor,
-        ),
         pageTransitionsTheme: const PageTransitionsTheme(
           builders: {
             TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),

lib/presentation/views/main_menu/custom_navigation_bar.dart

@@ -1,13 +1,15 @@
+import 'dart:ui';
+
 import 'package:flutter/material.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
-import 'package:tallee/core/custom_theme.dart';
+import 'package:game_tracker/core/custom_theme.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/group_view/group_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/groups_view.dart';
-import 'package:tallee/presentation/views/main_menu/home_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/home_view.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/match_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/match_view.dart';
-import 'package:tallee/presentation/views/main_menu/settings_view/settings_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/settings_view/settings_view.dart';
-import 'package:tallee/presentation/views/main_menu/statistics_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/statistics_view.dart';
-import 'package:tallee/presentation/widgets/navbar_item.dart';
+import 'package:game_tracker/presentation/widgets/navbar_item.dart';
 
 class CustomNavigationBar extends StatefulWidget {
   /// A custom navigation bar widget that provides tabbed navigation
@@ -38,7 +40,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
       ),
       KeyedSubtree(
         key: ValueKey('groups_$tabKeyCount'),
-        child: const GroupView(),
+        child: const GroupsView(),
       ),
       KeyedSubtree(
         key: ValueKey('stats_$tabKeyCount'),
@@ -73,62 +75,103 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
       backgroundColor: CustomTheme.backgroundColor,
       body: tabs[currentIndex],
       extendBody: true,
-      bottomNavigationBar: Container(
+      bottomNavigationBar: SizedBox(
-        height: 115,
+        height: 70 + MediaQuery.of(context).padding.bottom,
-        decoration: BoxDecoration(
+        child: Stack(
-          color: CustomTheme.navBarBackgroundColor,
+          children: [
-          border: Border.all(
+            // Dynamically generated blur layers for ultra-smooth transition
-            strokeAlign: BorderSide.strokeAlignOutside,
+            ...List.generate(34, (index) {
-            color: CustomTheme.boxBorderColor,
+              // Use cubic curve for an even more natural, smoother transition
-            width: 2,
+              final progress = index / 34.0; // 0.0 to 1.0
-          ),
+              final cubic = progress * progress * progress; // cubic curve
-          borderRadius: const BorderRadius.only(
+              final blurStrength =
-            topLeft: Radius.circular(30),
+                  0.5 + (cubic * 50.0); // Very smooth from 0.5 to 50.5
-            topRight: Radius.circular(30),
+
-          ),
+              // Height goes completely from 100% to 0% (all the way down)
-          boxShadow: [
+              // With extra density at the bottom for softer transition
-            BoxShadow(
+              final heightFactor = index < 25
-              color: Colors.black.withValues(alpha: 0.1),
+                  // First 25 layers: 100% to 30%
-              blurRadius: 20,
+                  ? 1.0 - (progress * 0.7)
-              offset: const Offset(0, -5),
+                  // Last 10 layers: 30% to 0% (denser)
+                  : 0.3 - ((index - 25) / 34.0);
+
+              return Positioned(
+                left: 0,
+                right: 0,
+                bottom: 0,
+                height:
+                    (70 + MediaQuery.of(context).padding.bottom) *
+                    heightFactor.clamp(0.05, 1.0),
+                child: ClipRect(
+                  child: BackdropFilter(
+                    filter: ImageFilter.blur(
+                      sigmaX: blurStrength,
+                      sigmaY: blurStrength,
+                    ),
+                    child: Container(color: Colors.transparent),
+                  ),
+                ),
+              );
+            }),
+            // Gradient overlay
+            Positioned.fill(
+              child: Container(
+                decoration: BoxDecoration(
+                  gradient: LinearGradient(
+                    begin: Alignment.bottomCenter,
+                    end: Alignment.topCenter,
+                    colors: [
+                      CustomTheme.boxColor.withValues(alpha: 1),
+                      CustomTheme.boxColor.withValues(alpha: 0.5),
+                      CustomTheme.boxColor.withValues(alpha: 0.2),
+                      CustomTheme.boxColor.withValues(alpha: 0.0),
+                    ],
+                    stops: const [0.0, 0.4, 0.8, 1],
+                  ),
+                ),
+              ),
+            ),
+            // Navbar content
+            SafeArea(
+              child: SizedBox(
+                height: 70,
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceAround,
+                  children: <Widget>[
+                    NavbarItem(
+                      index: 0,
+                      isSelected: currentIndex == 0,
+                      icon: Icons.home_rounded,
+                      label: loc.home,
+                      onTabTapped: onTabTapped,
+                    ),
+                    NavbarItem(
+                      index: 1,
+                      isSelected: currentIndex == 1,
+                      icon: Icons.gamepad_rounded,
+                      label: loc.matches,
+                      onTabTapped: onTabTapped,
+                    ),
+                    NavbarItem(
+                      index: 2,
+                      isSelected: currentIndex == 2,
+                      icon: Icons.group_rounded,
+                      label: loc.groups,
+                      onTabTapped: onTabTapped,
+                    ),
+                    NavbarItem(
+                      index: 3,
+                      isSelected: currentIndex == 3,
+                      icon: Icons.bar_chart_rounded,
+                      label: loc.statistics,
+                      onTabTapped: onTabTapped,
+                    ),
+                  ],
+                ),
+              ),
             ),
           ],
         ),
-        child: SafeArea(
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceAround,
-            children: <Widget>[
-              NavbarItem(
-                index: 0,
-                isSelected: currentIndex == 0,
-                icon: Icons.home_rounded,
-                label: loc.home,
-                onTabTapped: onTabTapped,
-              ),
-              NavbarItem(
-                index: 1,
-                isSelected: currentIndex == 1,
-                icon: Icons.gamepad_rounded,
-                label: loc.matches,
-                onTabTapped: onTabTapped,
-              ),
-              NavbarItem(
-                index: 2,
-                isSelected: currentIndex == 2,
-                icon: Icons.group_rounded,
-                label: loc.groups,
-                onTabTapped: onTabTapped,
-              ),
-              NavbarItem(
-                index: 3,
-                isSelected: currentIndex == 3,
-                icon: Icons.bar_chart_rounded,
-                label: loc.statistics,
-                onTabTapped: onTabTapped,
-              ),
-            ],
-          ),
-        ),
       ),
     );
   }

lib/presentation/views/main_menu/group_view/create_group_view.dart

@@ -1,20 +1,19 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/constants.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:game_tracker/core/enums.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/dto/group.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
+import 'package:game_tracker/presentation/widgets/player_selection.dart';
+import 'package:game_tracker/presentation/widgets/text_input/text_input_field.dart';
 import 'package:provider/provider.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/core/enums.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/group.dart';
-import 'package:tallee/data/dto/player.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/widgets/buttons/custom_width_button.dart';
-import 'package:tallee/presentation/widgets/player_selection.dart';
-import 'package:tallee/presentation/widgets/text_input/text_input_field.dart';
 
 class CreateGroupView extends StatefulWidget {
-  const CreateGroupView({super.key, this.groupToEdit});
+  /// A view that allows the user to create a new group
-
+  const CreateGroupView({super.key});
-  /// The group to edit, if any
-  final Group? groupToEdit;
 
   @override
   State<CreateGroupView> createState() => _CreateGroupViewState();
@@ -23,29 +22,16 @@ class CreateGroupView extends StatefulWidget {
 class _CreateGroupViewState extends State<CreateGroupView> {
   late final AppDatabase db;
 
-  /// GlobalKey for ScaffoldMessenger to show snackbars
-  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
-
   /// Controller for the group name input field
   final _groupNameController = TextEditingController();
 
   /// List of currently selected players
   List<Player> selectedPlayers = [];
 
-  /// List of initially selected players (when editing a group)
-  List<Player> initialSelectedPlayers = [];
-
   @override
   void initState() {
     super.initState();
     db = Provider.of<AppDatabase>(context, listen: false);
-    if (widget.groupToEdit != null) {
-      _groupNameController.text = widget.groupToEdit!.name;
-      setState(() {
-        initialSelectedPlayers = widget.groupToEdit!.members;
-        selectedPlayers = widget.groupToEdit!.members;
-      });
-    }
     _groupNameController.addListener(() {
       setState(() {});
     });
@@ -61,58 +47,10 @@ class _CreateGroupViewState extends State<CreateGroupView> {
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
     return ScaffoldMessenger(
-      key: _scaffoldMessengerKey,
       child: Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: CustomTheme.backgroundColor,
-        appBar: AppBar(
+        appBar: AppBar(title: Text(loc.create_new_group)),
-          title: Text(
-            widget.groupToEdit == null ? loc.create_new_group : loc.edit_group,
-          ),
-          actions: widget.groupToEdit == null
-              ? []
-              : [
-                  IconButton(
-                    icon: const Icon(Icons.delete),
-                    onPressed: () async {
-                      if (widget.groupToEdit != null) {
-                        showDialog<bool>(
-                          context: context,
-                          builder: (context) => AlertDialog(
-                            title: Text(loc.delete_group),
-                            content: Text(loc.this_cannot_be_undone),
-                            actions: [
-                              TextButton(
-                                onPressed: () =>
-                                    Navigator.of(context).pop(false),
-                                child: Text(loc.cancel),
-                              ),
-                              TextButton(
-                                onPressed: () =>
-                                    Navigator.of(context).pop(true),
-                                child: Text(loc.delete),
-                              ),
-                            ],
-                          ),
-                        ).then((confirmed) async {
-                          if (confirmed == true && context.mounted) {
-                            bool success = await db.groupDao.deleteGroup(
-                              groupId: widget.groupToEdit!.id,
-                            );
-                            if (!context.mounted) return;
-                            if (success) {
-                              Navigator.pop(context);
-                            } else {
-                              if (!mounted) return;
-                              showSnackbar(message: loc.error_deleting_group);
-                            }
-                          }
-                        });
-                      }
-                    },
-                  ),
-                ],
-        ),
         body: SafeArea(
           child: Column(
             mainAxisAlignment: MainAxisAlignment.start,
@@ -122,11 +60,11 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                 child: TextInputField(
                   controller: _groupNameController,
                   hintText: loc.group_name,
+                  maxLength: Constants.MAX_GROUP_NAME_LENGTH,
                 ),
               ),
               Expanded(
                 child: PlayerSelection(
-                  initialSelectedPlayers: initialSelectedPlayers,
                   onChanged: (value) {
                     setState(() {
                       selectedPlayers = [...value];
@@ -135,9 +73,7 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                 ),
               ),
               CustomWidthButton(
-                text: widget.groupToEdit == null
+                text: loc.create_group,
-                    ? loc.create_group
-                    : loc.edit_group,
                 sizeRelativeToWidth: 0.95,
                 buttonType: ButtonType.primary,
                 onPressed:
@@ -145,37 +81,28 @@ class _CreateGroupViewState extends State<CreateGroupView> {
                         (selectedPlayers.length < 2))
                     ? null
                     : () async {
-                        late Group? updatedGroup;
+                        bool success = await db.groupDao.addGroup(
-                        late bool success;
+                          group: Group(
-                        if (widget.groupToEdit == null) {
-                          success = await db.groupDao.addGroup(
-                            group: Group(
-                              name: _groupNameController.text.trim(),
-                              members: selectedPlayers,
-                            ),
-                          );
-                        } else {
-                          updatedGroup = Group(
-                            id: widget.groupToEdit!.id,
                             name: _groupNameController.text.trim(),
                             members: selectedPlayers,
-                          );
+                          ),
-                          //TODO: Implement group editing in database
+                        );
-                          /*
-                          success = await db.groupDao.updateGroup(
-                            group: updatedGroup,
-                          );
-                          */
-                          success = true;
-                        }
                         if (!context.mounted) return;
                         if (success) {
-                          Navigator.pop(context, updatedGroup);
+                          Navigator.pop(context);
                         } else {
-                          showSnackbar(
+                          ScaffoldMessenger.of(context).showSnackBar(
-                            message: widget.groupToEdit == null
+                            SnackBar(
-                                ? loc.error_creating_group
+                              backgroundColor: CustomTheme.boxColor,
-                                : loc.error_editing_group,
+                              content: Center(
+                                child: Text(
+                                  AppLocalizations.of(
+                                    context,
+                                  ).error_creating_group,
+                                  style: const TextStyle(color: Colors.white),
+                                ),
+                              ),
+                            ),
                           );
                         }
                       },
@@ -187,20 +114,4 @@ class _CreateGroupViewState extends State<CreateGroupView> {
       ),
     );
   }
-
-  /// Displays a snackbar with the given message and optional action.
-  ///
-  /// [message] The message to display in the snackbar.
-  void showSnackbar({required String message}) {
-    final messenger = _scaffoldMessengerKey.currentState;
-    if (messenger != null) {
-      messenger.hideCurrentSnackBar();
-      messenger.showSnackBar(
-        SnackBar(
-          content: Text(message, style: const TextStyle(color: Colors.white)),
-          backgroundColor: CustomTheme.boxColor,
-        ),
-      );
-    }
-  }
 }

lib/presentation/views/main_menu/group_view/group_profile_view.dart

@@ -1,26 +1,24 @@
 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/data/dto/group.dart';
+import 'package:game_tracker/data/dto/match.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
+import 'package:game_tracker/presentation/widgets/buttons/animated_dialog_button.dart';
+import 'package:game_tracker/presentation/widgets/buttons/main_menu_button.dart';
+import 'package:game_tracker/presentation/widgets/colored_icon_container.dart';
+import 'package:game_tracker/presentation/widgets/custom_alert_dialog.dart';
+import 'package:game_tracker/presentation/widgets/tiles/info_tile.dart';
+import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/group.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/data/dto/player.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/group_view/create_group_view.dart';
-import 'package:tallee/presentation/widgets/app_skeleton.dart';
-import 'package:tallee/presentation/widgets/buttons/animated_dialog_button.dart';
-import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
-import 'package:tallee/presentation/widgets/colored_icon_container.dart';
-import 'package:tallee/presentation/widgets/custom_alert_dialog.dart';
-import 'package:tallee/presentation/widgets/tiles/info_tile.dart';
-import 'package:tallee/presentation/widgets/tiles/text_icon_tile.dart';
 
-class GroupDetailView extends StatefulWidget {
+class GroupProfileView extends StatefulWidget {
   /// A view that displays the profile of a group
   /// - [group]: The group to display
-  const GroupDetailView({
+  const GroupProfileView({
     super.key,
     required this.group,
     required this.callback,
@@ -32,24 +30,21 @@ class GroupDetailView extends StatefulWidget {
   final VoidCallback callback;
 
   @override
-  State<GroupDetailView> createState() => _GroupDetailViewState();
+  State<GroupProfileView> createState() => _GroupProfileViewState();
 }
 
-class _GroupDetailViewState extends State<GroupDetailView> {
+class _GroupProfileViewState extends State<GroupProfileView> {
   late final AppDatabase db;
   bool isLoading = true;
-  late Group _group;
 
   /// Total matches played in this group
   int totalMatches = 0;
 
-  /// The best player in this group
   String bestPlayer = '';
 
   @override
   void initState() {
     super.initState();
-    _group = widget.group;
     db = Provider.of<AppDatabase>(context, listen: false);
     _loadStatistics();
   }
@@ -83,16 +78,14 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                       onPressed: () => Navigator.of(context).pop(true),
                       child: Text(
                         loc.delete,
-                        style: const TextStyle(
+                        style: TextStyle(color: CustomTheme.secondaryColor),
-                          color: CustomTheme.secondaryColor,
-                        ),
                       ),
                     ),
                   ],
                 ),
               ).then((confirmed) async {
                 if (confirmed! && context.mounted) {
-                  await db.groupDao.deleteGroup(groupId: _group.id);
+                  await db.groupDao.deleteGroup(groupId: widget.group.id);
                   if (!context.mounted) return;
                   Navigator.pop(context);
                   widget.callback.call();
@@ -123,7 +116,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                 ),
                 const SizedBox(height: 10),
                 Text(
-                  _group.name,
+                  widget.group.name,
                   style: const TextStyle(
                     fontSize: 28,
                     fontWeight: FontWeight.bold,
@@ -133,7 +126,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                 ),
                 const SizedBox(height: 5),
                 Text(
-                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(_group.createdAt)}',
+                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(widget.group.createdAt)}',
                   style: const TextStyle(
                     fontSize: 12,
                     color: CustomTheme.textColor,
@@ -150,7 +143,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                     crossAxisAlignment: WrapCrossAlignment.start,
                     spacing: 12,
                     runSpacing: 8,
-                    children: _group.members.map((member) {
+                    children: widget.group.members.map((member) {
                       return TextIconTile(
                         text: member.name,
                         iconEnabled: false,
@@ -168,7 +161,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                       children: [
                         _buildStatRow(
                           loc.members,
-                          _group.members.length.toString(),
+                          widget.group.members.length.toString(),
                         ),
                         _buildStatRow(
                           loc.played_matches,
@@ -186,22 +179,19 @@ class _GroupDetailViewState extends State<GroupDetailView> {
               child: MainMenuButton(
                 text: loc.edit_group,
                 icon: Icons.edit,
-                onPressed: () async {
+                onPressed: () {
-                  final updatedGroup = await Navigator.push<Group?>(
+                  // TODO: Uncomment when GroupDetailView is implemented
+                  /*
+                  await Navigator.push(
                     context,
                     adaptivePageRoute(
                       builder: (context) {
-                        return CreateGroupView(groupToEdit: _group);
+
+                        return const GroupDetailView();
                       },
                     ),
-                  );
+                  );*/
-                  if (updatedGroup != null && mounted) {
+                  print('Edit Group pressed');
-                    setState(() {
-                      _group = updatedGroup;
-                    });
-                    _loadStatistics();
-                    widget.callback();
-                  }
                 },
               ),
             ),
@@ -244,7 +234,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
   Future<void> _loadStatistics() async {
     final matches = await db.matchDao.getAllMatches();
     final groupMatches = matches
-        .where((match) => match.group?.id == _group.id)
+        .where((match) => match.group?.id == widget.group.id)
         .toList();
 
     setState(() {

lib/presentation/views/main_menu/group_view/groups_view.dart

@@ -1,28 +1,28 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
+import 'package:game_tracker/core/constants.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/dto/group.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/create_group_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/group_view/group_profile_view.dart';
+import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
+import 'package:game_tracker/presentation/widgets/buttons/main_menu_button.dart';
+import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart';
+import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 import 'package:provider/provider.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
-import 'package:tallee/core/constants.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/group.dart';
-import 'package:tallee/data/dto/player.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/group_view/create_group_view.dart';
-import 'package:tallee/presentation/views/main_menu/group_view/group_detail_view.dart';
-import 'package:tallee/presentation/widgets/app_skeleton.dart';
-import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
-import 'package:tallee/presentation/widgets/tiles/group_tile.dart';
-import 'package:tallee/presentation/widgets/top_centered_message.dart';
 
-class GroupView extends StatefulWidget {
+class GroupsView extends StatefulWidget {
   /// A view that displays a list of groups
-  const GroupView({super.key});
+  const GroupsView({super.key});
 
   @override
-  State<GroupView> createState() => _GroupViewState();
+  State<GroupsView> createState() => _GroupsViewState();
 }
 
-class _GroupViewState extends State<GroupView> {
+class _GroupsViewState extends State<GroupsView> {
   late final AppDatabase db;
 
   /// Loaded groups from the database
@@ -82,7 +82,7 @@ class _GroupViewState extends State<GroupView> {
                         context,
                         adaptivePageRoute(
                           builder: (context) {
-                            return GroupDetailView(
+                            return GroupProfileView(
                               group: groups[index],
                               callback: loadGroups,
                             );

lib/presentation/views/main_menu/home_view.dart

@@ -1,18 +1,18 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
+import 'package:game_tracker/core/constants.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/dto/group.dart';
+import 'package:game_tracker/data/dto/match.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/match_result_view.dart';
+import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
+import 'package:game_tracker/presentation/widgets/buttons/quick_create_button.dart';
+import 'package:game_tracker/presentation/widgets/tiles/info_tile.dart';
+import 'package:game_tracker/presentation/widgets/tiles/match_tile.dart';
+import 'package:game_tracker/presentation/widgets/tiles/quick_info_tile.dart';
 import 'package:provider/provider.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
-import 'package:tallee/core/constants.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/group.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/data/dto/player.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/match_result_view.dart';
-import 'package:tallee/presentation/widgets/app_skeleton.dart';
-import 'package:tallee/presentation/widgets/buttons/quick_create_button.dart';
-import 'package:tallee/presentation/widgets/tiles/info_tile.dart';
-import 'package:tallee/presentation/widgets/tiles/match_tile.dart';
-import 'package:tallee/presentation/widgets/tiles/quick_info_tile.dart';
 
 class HomeView extends StatefulWidget {
   /// The main home view of the application, displaying quick info,

lib/presentation/views/main_menu/match_view/create_match/choose_game_view.dart

@@ -1,9 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/core/custom_theme.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
-import 'package:tallee/core/enums.dart';
+import 'package:game_tracker/core/custom_theme.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/core/enums.dart';
-import 'package:tallee/presentation/widgets/text_input/custom_search_bar.dart';
+import 'package:game_tracker/data/dto/game.dart';
-import 'package:tallee/presentation/widgets/tiles/title_description_list_tile.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/game_view/create_game_view.dart';
+import 'package:game_tracker/presentation/widgets/text_input/custom_search_bar.dart';
+import 'package:game_tracker/presentation/widgets/tiles/title_description_list_tile.dart';
 
 class ChooseGameView extends StatefulWidget {
   /// A view that allows the user to choose a game from a list of available games
@@ -51,6 +54,17 @@ class _ChooseGameViewState extends State<ChooseGameView> {
             Navigator.of(context).pop(selectedGameIndex);
           },
         ),
+        actions: [IconButton(
+          icon: const Icon(Icons.add),
+          onPressed: () async {
+            await Navigator.push(context, adaptivePageRoute(
+              builder: (context) => CreateGameView(
+                callback: () {}, //TODO: implement callback
+              ),
+            )
+            );
+          },
+        )],
         title: Text(loc.choose_game),
       ),
       body: PopScope(
@@ -85,7 +99,7 @@ class _ChooseGameViewState extends State<ChooseGameView> {
                       context,
                     ),
                     isHighlighted: selectedGameIndex == index,
-                    onPressed: () async {
+                    onTap: () async {
                       setState(() {
                         if (selectedGameIndex == index) {
                           selectedGameIndex = -1;
@@ -94,6 +108,16 @@ class _ChooseGameViewState extends State<ChooseGameView> {
                         }
                       });
                     },
+                    onLongPress: () async {
+                      await Navigator.push(context, adaptivePageRoute(
+                        builder: (context) => CreateGameView(
+                          //TODO: implement callback & giving real game to create game view
+                          gameToEdit: Game(name: 'Cabo', description: '', ruleset: 'Highest Points'),
+                          callback: () {},
+                        ),
+                      )
+                      );
+                    },
                   );
                 },
               ),

lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/core/custom_theme.dart';
+import 'package:game_tracker/core/custom_theme.dart';
-import 'package:tallee/data/dto/group.dart';
+import 'package:game_tracker/data/dto/group.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/widgets/text_input/custom_search_bar.dart';
+import 'package:game_tracker/presentation/widgets/text_input/custom_search_bar.dart';
-import 'package:tallee/presentation/widgets/tiles/group_tile.dart';
+import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart';
-import 'package:tallee/presentation/widgets/top_centered_message.dart';
+import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 
 class ChooseGroupView extends StatefulWidget {
   /// A view that allows the user to choose a group from a list of groups.

lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart

@@ -1,33 +1,30 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
+import 'package:game_tracker/core/constants.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:game_tracker/core/enums.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/dto/group.dart';
+import 'package:game_tracker/data/dto/match.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/choose_game_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/choose_group_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/match_result_view.dart';
+import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
+import 'package:game_tracker/presentation/widgets/player_selection.dart';
+import 'package:game_tracker/presentation/widgets/text_input/text_input_field.dart';
+import 'package:game_tracker/presentation/widgets/tiles/choose_tile.dart';
 import 'package:provider/provider.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
-import 'package:tallee/core/constants.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/core/enums.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/group.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/data/dto/player.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/create_match/choose_game_view.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/create_match/choose_group_view.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/match_result_view.dart';
-import 'package:tallee/presentation/widgets/buttons/custom_width_button.dart';
-import 'package:tallee/presentation/widgets/player_selection.dart';
-import 'package:tallee/presentation/widgets/text_input/text_input_field.dart';
-import 'package:tallee/presentation/widgets/tiles/choose_tile.dart';
 
 class CreateMatchView extends StatefulWidget {
   /// A view that allows creating a new match
   /// [onWinnerChanged]: Optional callback invoked when the winner is changed
-  const CreateMatchView({super.key, this.onWinnerChanged, this.match});
+  const CreateMatchView({super.key, this.onWinnerChanged});
 
   /// Optional callback invoked when the winner is changed
   final VoidCallback? onWinnerChanged;
 
-  /// An optional match to prefill the fields
-  final Match? match;
-
   @override
   State<CreateMatchView> createState() => _CreateMatchViewState();
 }
@@ -67,9 +64,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// The currently selected players
   List<Player>? selectedPlayers;
 
-  /// GlobalKey for ScaffoldMessenger to show snackbars
-  final _scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
-
   @override
   void initState() {
     super.initState();
@@ -89,20 +83,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
         filteredPlayerList = List.from(playerList);
       });
     });
-
-    // If a match is provided, prefill the fields
-    if (widget.match != null) {
-      final match = widget.match!;
-      _matchNameController.text = match.name;
-      selectedGroup = match.group;
-      selectedGroupId = match.group?.id ?? '';
-      selectedPlayers = match.players ?? [];
-      if (selectedGroup != null) {
-        filteredPlayerList = playerList
-            .where((p) => !selectedGroup!.members.any((m) => m.id == p.id))
-            .toList();
-      }
-    }
   }
 
   @override
@@ -126,12 +106,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
-    final buttonText = widget.match != null
-        ? loc.save_changes
-        : loc.create_match;
-
     return ScaffoldMessenger(
-      key: _scaffoldMessengerKey,
       child: Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: CustomTheme.backgroundColor,
@@ -212,12 +187,32 @@ class _CreateMatchViewState extends State<CreateMatchView> {
                 ),
               ),
               CustomWidthButton(
-                text: buttonText,
+                text: loc.create_match,
                 sizeRelativeToWidth: 0.95,
                 buttonType: ButtonType.primary,
                 onPressed: _enableCreateGameButton()
-                    ? () {
+                    ? () async {
-                        buttonNavigation(context);
+                        Match match = Match(
+                          name: _matchNameController.text.isEmpty
+                              ? (hintText ?? '')
+                              : _matchNameController.text.trim(),
+                          createdAt: DateTime.now(),
+                          group: selectedGroup,
+                          players: selectedPlayers,
+                        );
+                        await db.matchDao.addMatch(match: match);
+                        if (context.mounted) {
+                          Navigator.pushReplacement(
+                            context,
+                            adaptivePageRoute(
+                              fullscreenDialog: true,
+                              builder: (context) => MatchResultView(
+                                match: match,
+                                onWinnerChanged: widget.onWinnerChanged,
+                              ),
+                            ),
+                          );
+                        }
                       }
                     : null,
               ),
@@ -235,35 +230,6 @@ class _CreateMatchViewState extends State<CreateMatchView> {
   /// - Either a group is selected OR at least 2 players are selected
   bool _enableCreateGameButton() {
     return (selectedGroup != null ||
-        (selectedPlayers != null && selectedPlayers!.length > 1));
+            (selectedPlayers != null && selectedPlayers!.length > 1));
-  }
-
-  void buttonNavigation(BuildContext context) async {
-    if (widget.match != null) {
-      // TODO: Implement updating match logic here
-      Navigator.pop(context);
-    } else {
-      Match match = Match(
-        name: _matchNameController.text.isEmpty
-            ? (hintText ?? '')
-            : _matchNameController.text.trim(),
-        createdAt: DateTime.now(),
-        group: selectedGroup,
-        players: selectedPlayers,
-      );
-      await db.matchDao.addMatch(match: match);
-      if (context.mounted) {
-        Navigator.pushReplacement(
-          context,
-          adaptivePageRoute(
-            fullscreenDialog: true,
-            builder: (context) => MatchResultView(
-              match: match,
-              onWinnerChanged: widget.onWinnerChanged,
-            ),
-          ),
-        );
-      }
-    }
   }
 }

lib/presentation/views/main_menu/match_view/create_match/game_view/choose_ruleset_view.dart

@@ -0,0 +1,93 @@
+import 'package:flutter/material.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:game_tracker/core/enums.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/widgets/tiles/title_description_list_tile.dart';
+class ChooseRulesetView extends StatefulWidget {
+  /// A view that allows the user to choose a ruleset from a list of available rulesets
+  /// - [rulesets]: A list of tuples containing the ruleset and its description
+  /// - [initialRulesetIndex]: The index of the initially selected ruleset
+  const ChooseRulesetView({
+    super.key,
+    required this.rulesets,
+    required this.initialRulesetIndex,
+  });
+  /// A list of tuples containing the ruleset and its description
+  final List<(Ruleset, String)> rulesets;
+  /// The index of the initially selected ruleset
+  final int initialRulesetIndex;
+  @override
+  State<ChooseRulesetView> createState() => _ChooseRulesetViewState();
+}
+class _ChooseRulesetViewState extends State<ChooseRulesetView> {
+  /// Currently selected ruleset index
+  late int selectedRulesetIndex;
+
+  @override
+  void initState() {
+    selectedRulesetIndex = widget.initialRulesetIndex;
+    super.initState();
+  }
+  @override
+  Widget build(BuildContext context) {
+    final loc = AppLocalizations.of(context);
+    return DefaultTabController(
+      length: 2,
+      initialIndex: 0,
+      child: Scaffold(
+        backgroundColor: CustomTheme.backgroundColor,
+        appBar: AppBar(
+          leading: IconButton(
+            icon: const Icon(Icons.arrow_back_ios),
+            onPressed: () {
+              Navigator.of(context).pop(
+                selectedRulesetIndex == -1
+                    ? null
+                    : widget.rulesets[selectedRulesetIndex].$1,
+              );
+            },
+          ),
+          title: Text(loc.choose_ruleset),
+        ),
+        body: PopScope(
+          // This fixes that the Android Back Gesture didn't return the
+          // selectedRulesetIndex and therefore the selected Ruleset wasn't saved
+          canPop: false,
+          onPopInvokedWithResult: (bool didPop, Object? result) {
+            if (didPop) {
+              return;
+            }
+            Navigator.of(context).pop(
+              selectedRulesetIndex == -1
+                  ? null
+                  : widget.rulesets[selectedRulesetIndex].$1,
+            );
+          },
+          child: ListView.builder(
+            padding: const EdgeInsets.only(bottom: 85),
+            itemCount: widget.rulesets.length,
+            itemBuilder: (BuildContext context, int index) {
+              return TitleDescriptionListTile(
+                onTap: () async {
+                  setState(() {
+                    if (selectedRulesetIndex == index) {
+                      selectedRulesetIndex = -1;
+                    } else {
+                      selectedRulesetIndex = index;
+                    }
+                  });
+                },
+                title: translateRulesetToString(
+                  widget.rulesets[index].$1,
+                  context,
+                ),
+                description: widget.rulesets[index].$2,
+                isHighlighted: selectedRulesetIndex == index,
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/presentation/views/main_menu/match_view/create_match/game_view/create_game_view.dart

@@ -0,0 +1,140 @@
+import 'package:flutter/material.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
+import 'package:game_tracker/core/constants.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:game_tracker/core/enums.dart';
+import 'package:game_tracker/data/dto/game.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/game_view/choose_ruleset_view.dart';
+import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.dart';
+import 'package:game_tracker/presentation/widgets/text_input/text_input_field.dart';
+import 'package:game_tracker/presentation/widgets/tiles/choose_tile.dart';
+
+class CreateGameView extends StatefulWidget {
+  const CreateGameView({super.key, this.gameToEdit, required this.callback});
+
+  final Game? gameToEdit;
+
+  final VoidCallback callback;
+
+  @override
+  State<CreateGameView> createState() => _CreateGameViewState();
+}
+
+class _CreateGameViewState extends State<CreateGameView> {
+  Ruleset? selectedRuleset;
+  int selectedRulesetIndex = -1;
+  late List<(Ruleset, String)> _rulesets;
+
+  final _gameNameController = TextEditingController();
+  final _descriptionController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    _gameNameController.addListener(() => setState(() {}));
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    final loc = AppLocalizations.of(context);
+    _rulesets = [
+      (Ruleset.singleWinner, loc.ruleset_single_winner),
+      (Ruleset.singleLoser, loc.ruleset_single_loser),
+      (Ruleset.mostPoints, loc.ruleset_most_points),
+      (Ruleset.leastPoints, loc.ruleset_least_points),
+    ];
+
+    if (widget.gameToEdit != null) {
+      _gameNameController.text = widget.gameToEdit!.name;
+      _descriptionController.text = widget.gameToEdit!.description ?? '';
+      // TODO: Handle ruleset initialization from gameToEdit
+    }
+  }
+
+  @override
+  void dispose() {
+    _gameNameController.dispose();
+    _descriptionController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    var loc = AppLocalizations.of(context);
+    final isEditing = widget.gameToEdit != null;
+
+    return ScaffoldMessenger(
+      child: Scaffold(
+        backgroundColor: CustomTheme.backgroundColor,
+        appBar: AppBar(
+          title: Text(isEditing ? loc.edit_game : loc.create_game),
+        ),
+        body: SafeArea(
+          child: Column(
+            children: [
+              Container(
+                margin: CustomTheme.tileMargin,
+                child: TextInputField(
+                  controller: _gameNameController,
+                  maxLength: Constants.MAX_MATCH_NAME_LENGTH,
+                  hintText: loc.game_name,
+                ),
+              ),
+              ChooseTile(
+                title: loc.ruleset,
+                trailingText: selectedRuleset == null
+                    ? loc.none
+                    : translateRulesetToString(selectedRuleset!, context),
+                onPressed: () async {
+                  final result = await Navigator.of(context).push<Ruleset?>(
+                    adaptivePageRoute(
+                      builder: (context) => ChooseRulesetView(
+                        rulesets: _rulesets,
+                        initialRulesetIndex: selectedRulesetIndex,
+                      ),
+                    ),
+                  );
+                  if (mounted) {
+                    setState(() {
+                      selectedRuleset = result;
+                      selectedRulesetIndex =
+                          result == null ? -1 : _rulesets.indexWhere((r) => r.$1 == result);
+                    });
+                  }
+                },
+              ),
+              Container(
+                margin: CustomTheme.tileMargin,
+                child: TextInputField(
+                  controller: _descriptionController,
+                  hintText: loc.description,
+                  minLines: 6,
+                  maxLines: 6,
+                  maxLength: Constants.MAX_GAME_DESCRIPTION_LENGTH,
+                  showCounterText: true,
+                ),
+              ),
+              const Spacer(),
+              Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: CustomWidthButton(
+                  text: isEditing ? loc.edit_group : loc.create_game,
+                  sizeRelativeToWidth: 1,
+                  buttonType: ButtonType.primary,
+                  onPressed: _gameNameController.text.trim().isNotEmpty && selectedRulesetIndex != -1
+                      ? () {
+                          //TODO: Handle saving to db & updating game selection view
+                          Navigator.of(context).pop();
+                        }
+                      : null,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

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

@@ -1,285 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/data/dto/player.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/create_match/create_match_view.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/match_result_view.dart';
-import 'package:tallee/presentation/widgets/buttons/animated_dialog_button.dart';
-import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
-import 'package:tallee/presentation/widgets/colored_icon_container.dart';
-import 'package:tallee/presentation/widgets/custom_alert_dialog.dart';
-import 'package:tallee/presentation/widgets/tiles/info_tile.dart';
-import 'package:tallee/presentation/widgets/tiles/text_icon_tile.dart';
-
-class MatchDetailView extends StatefulWidget {
-  /// A view that displays the profile of a match
-  /// - [match]: The match to display
-  /// - [callback]: Callback to refresh the match list
-  const MatchDetailView({
-    super.key,
-    required this.match,
-    required this.callback,
-  });
-
-  /// The match to display
-  final Match match;
-
-  /// Callback to refresh the match list
-  final VoidCallback callback;
-
-  @override
-  State<MatchDetailView> createState() => _MatchDetailViewState();
-}
-
-class _MatchDetailViewState extends State<MatchDetailView> {
-  late final AppDatabase db;
-
-  late Player? currentWinner;
-
-  /// All players who participated in the match
-  late final List<Player> allPlayers;
-
-  @override
-  void initState() {
-    super.initState();
-    db = Provider.of<AppDatabase>(context, listen: false);
-    allPlayers = _getAllPlayers();
-    currentWinner = widget.match.winner;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final loc = AppLocalizations.of(context);
-
-    return Scaffold(
-      backgroundColor: CustomTheme.backgroundColor,
-      appBar: AppBar(
-        title: Text(loc.match_profile),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.delete),
-            onPressed: () async {
-              showDialog<bool>(
-                context: context,
-                builder: (context) => CustomAlertDialog(
-                  title: '${loc.delete_match}?',
-                  content: loc.this_cannot_be_undone,
-                  actions: [
-                    AnimatedDialogButton(
-                      onPressed: () => Navigator.of(context).pop(false),
-                      child: Text(
-                        loc.cancel,
-                        style: const TextStyle(color: CustomTheme.textColor),
-                      ),
-                    ),
-                    AnimatedDialogButton(
-                      onPressed: () => Navigator.of(context).pop(true),
-                      child: Text(
-                        loc.delete,
-                        style: const TextStyle(
-                          color: CustomTheme.secondaryColor,
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ).then((confirmed) async {
-                if (confirmed! && context.mounted) {
-                  await db.matchDao.deleteMatch(matchId: widget.match.id);
-                  if (!context.mounted) return;
-                  Navigator.pop(context);
-                  widget.callback.call();
-                }
-              });
-            },
-          ),
-        ],
-      ),
-      body: SafeArea(
-        child: Stack(
-          alignment: Alignment.center,
-          children: [
-            ListView(
-              padding: const EdgeInsets.only(
-                left: 12,
-                right: 12,
-                top: 20,
-                bottom: 100,
-              ),
-              children: [
-                const Center(
-                  child: ColoredIconContainer(
-                    icon: Icons.sports_esports,
-                    containerSize: 55,
-                    iconSize: 38,
-                  ),
-                ),
-                const SizedBox(height: 10),
-                Text(
-                  widget.match.name,
-                  style: const TextStyle(
-                    fontSize: 28,
-                    fontWeight: FontWeight.bold,
-                    color: CustomTheme.textColor,
-                  ),
-                  textAlign: TextAlign.center,
-                ),
-                const SizedBox(height: 5),
-                Text(
-                  '${loc.created_on} ${DateFormat.yMMMd(Localizations.localeOf(context).toString()).format(widget.match.createdAt)}',
-                  style: const TextStyle(
-                    fontSize: 12,
-                    color: CustomTheme.textColor,
-                  ),
-                  textAlign: TextAlign.center,
-                ),
-                const SizedBox(height: 10),
-                if (widget.match.group != null) ...[
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const Icon(Icons.group),
-                      const SizedBox(width: 8),
-                      Text(
-                        // TODO: Update after DB changes
-                        '${widget.match.group!.name} ${widget.match.players != null ? '+ ${widget.match.players!.length}' : ''}',
-                        style: const TextStyle(fontWeight: FontWeight.bold),
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 20),
-                ],
-                InfoTile(
-                  title: loc.players,
-                  icon: Icons.people,
-                  horizontalAlignment: CrossAxisAlignment.start,
-                  content: Wrap(
-                    alignment: WrapAlignment.start,
-                    crossAxisAlignment: WrapCrossAlignment.start,
-                    spacing: 12,
-                    runSpacing: 8,
-                    children: allPlayers.map((player) {
-                      return TextIconTile(
-                        text: player.name,
-                        iconEnabled: false,
-                      );
-                    }).toList(),
-                  ),
-                ),
-                const SizedBox(height: 15),
-                InfoTile(
-                  title: loc.results,
-                  icon: Icons.emoji_events,
-                  content: Padding(
-                    padding: const EdgeInsets.symmetric(
-                      vertical: 4,
-                      horizontal: 8,
-                    ),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        /// TODO: Implement different ruleset results display
-                        if (currentWinner != null) ...[
-                          Text(
-                            loc.winner,
-                            style: const TextStyle(
-                              fontSize: 16,
-                              color: CustomTheme.textColor,
-                            ),
-                          ),
-                          Text(
-                            currentWinner!.name,
-                            style: TextStyle(
-                              fontSize: 16,
-                              fontWeight: FontWeight.bold,
-                              color: widget.match.winner != null
-                                  ? CustomTheme.primaryColor
-                                  : CustomTheme.textColor,
-                            ),
-                          ),
-                        ] else ...[
-                          Text(
-                            loc.no_results_entered_yet,
-                            style: const TextStyle(
-                              fontSize: 14,
-                              color: CustomTheme.textColor,
-                            ),
-                          ),
-                        ],
-                      ],
-                    ),
-                  ),
-                ),
-              ],
-            ),
-            Positioned(
-              bottom: MediaQuery.paddingOf(context).bottom,
-              child: Row(
-                children: [
-                  MainMenuButton(
-                    icon: Icons.edit,
-                    onPressed: () => Navigator.push(
-                      context,
-                      adaptivePageRoute(
-                        fullscreenDialog: true,
-                        builder: (context) =>
-                            CreateMatchView(match: widget.match),
-                      ),
-                    ),
-                  ),
-                  const SizedBox(width: 15),
-                  MainMenuButton(
-                    text: loc.enter_results,
-                    icon: Icons.emoji_events,
-                    onPressed: () async {
-                      currentWinner = await Navigator.push(
-                        context,
-                        adaptivePageRoute(
-                          fullscreenDialog: true,
-                          builder: (context) => MatchResultView(
-                            match: widget.match,
-                            onWinnerChanged: () {
-                              widget.callback.call();
-                              setState(() {});
-                            },
-                          ),
-                        ),
-                      );
-                    },
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  /// Gets all players who participated in the match (from group and individual players)
-  List<Player> _getAllPlayers() {
-    final List<Player> players = [];
-
-    // Add group members if group exists
-    if (widget.match.group != null) {
-      players.addAll(widget.match.group!.members);
-    }
-
-    // Add individual players
-    if (widget.match.players != null) {
-      for (var player in widget.match.players!) {
-        // Avoid duplicates
-        if (!players.any((p) => p.id == player.id)) {
-          players.add(player);
-        }
-      }
-    }
-
-    return players;
-  }
-}

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

@@ -1,11 +1,11 @@
 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/data/dto/match.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/widgets/tiles/custom_radio_list_tile.dart';
 import 'package:provider/provider.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/data/dto/player.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/widgets/tiles/custom_radio_list_tile.dart';
 
 class MatchResultView extends StatefulWidget {
   /// A view that allows selecting and saving the winner of a match
@@ -54,7 +54,7 @@ class _MatchResultViewState extends State<MatchResultView> {
           icon: const Icon(Icons.close),
           onPressed: () {
             widget.onWinnerChanged?.call();
-            Navigator.of(context).pop(_selectedPlayer);
+            Navigator.of(context).pop();
           },
         ),
         title: Text(widget.match.name),
@@ -74,7 +74,7 @@ class _MatchResultViewState extends State<MatchResultView> {
                 ),
                 decoration: BoxDecoration(
                   color: CustomTheme.boxColor,
-                  border: Border.all(color: CustomTheme.boxBorderColor),
+                  border: Border.all(color: CustomTheme.boxBorder),
                   borderRadius: BorderRadius.circular(12),
                 ),
                 child: Column(

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

@@ -2,21 +2,21 @@ import 'dart:core' hide Match;
 
 import 'package:flutter/material.dart';
 import 'package:fluttericon/rpg_awesome_icons.dart';
+import 'package:game_tracker/core/adaptive_page_route.dart';
+import 'package:game_tracker/core/constants.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/dto/group.dart';
+import 'package:game_tracker/data/dto/match.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/create_match/create_match_view.dart';
+import 'package:game_tracker/presentation/views/main_menu/match_view/match_result_view.dart';
+import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
+import 'package:game_tracker/presentation/widgets/buttons/main_menu_button.dart';
+import 'package:game_tracker/presentation/widgets/tiles/match_tile.dart';
+import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 import 'package:provider/provider.dart';
-import 'package:tallee/core/adaptive_page_route.dart';
-import 'package:tallee/core/constants.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/group.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/data/dto/player.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/create_match/create_match_view.dart';
-import 'package:tallee/presentation/views/main_menu/match_view/match_detail_view.dart';
-import 'package:tallee/presentation/widgets/app_skeleton.dart';
-import 'package:tallee/presentation/widgets/buttons/main_menu_button.dart';
-import 'package:tallee/presentation/widgets/tiles/match_tile.dart';
-import 'package:tallee/presentation/widgets/top_centered_message.dart';
 
 class MatchView extends StatefulWidget {
   /// A view that displays a list of matches
@@ -89,9 +89,10 @@ class _MatchViewState extends State<MatchView> {
                           Navigator.push(
                             context,
                             adaptivePageRoute(
-                              builder: (context) => MatchDetailView(
+                              fullscreenDialog: true,
+                              builder: (context) => MatchResultView(
                                 match: matches[index],
-                                callback: loadGames,
+                                onWinnerChanged: loadGames,
                               ),
                             ),
                           );
@@ -127,7 +128,6 @@ class _MatchViewState extends State<MatchView> {
 
   /// Loads the games from the database and sorts them by creation date.
   void loadGames() {
-    isLoading = true;
     Future.wait([
       db.matchDao.getAllMatches(),
       Future.delayed(Constants.MINIMUM_SKELETON_DURATION),

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

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/core/custom_theme.dart';
+import 'package:game_tracker/core/custom_theme.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
+import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
-import 'package:tallee/presentation/widgets/colored_icon_container.dart';
+import 'package:game_tracker/presentation/widgets/colored_icon_container.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class LicenseDetailView extends StatelessWidget {
@@ -89,7 +89,7 @@ class LicenseDetailView extends StatelessWidget {
                           maxLines: 1,
                           overflow: TextOverflow.ellipsis,
                           textAlign: TextAlign.center,
-                          style: const TextStyle(
+                          style: TextStyle(
                             fontSize: 12,
                             color: CustomTheme.secondaryColor,
                             decoration: TextDecoration.underline,

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

@@ -8,7 +8,7 @@
 // https://pub.dev/packages/dart_pubspec_licenses
 
 /// This package.
-const thisPackage = _tallee;
+const thisPackage = _game_tracker;
 
 /// All dependencies including transitive dependencies.
 const allDependencies = <Package>[
@@ -31,7 +31,6 @@ const allDependencies = <Package>[
   _cli_config,
   _cli_util,
   _clock,
-  _code_assets,
   _code_builder,
   _collection,
   _convert,
@@ -58,12 +57,10 @@ const allDependencies = <Package>[
   _flutter_lints,
   _flutter_plugin_android_lifecycle,
   _flutter_web_plugins,
-  _fluttericon,
   _font_awesome_flutter,
   _frontend_server_client,
   _glob,
   _graphs,
-  _hooks,
   _html,
   _http,
   _http_multi_server,
@@ -83,10 +80,8 @@ const allDependencies = <Package>[
   _material_color_utilities,
   _meta,
   _mime,
-  _native_toolchain_c,
   _nested,
   _node_preamble,
-  _objective_c,
   _package_config,
   _package_info_plus,
   _package_info_plus_platform_interface,
@@ -165,7 +160,6 @@ const dependencies = <Package>[
   _drift_flutter,
   _file_picker,
   _file_saver,
-  _fluttericon,
   _font_awesome_flutter,
   _intl,
   _json_schema,
@@ -523,13 +517,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// build_daemon 4.1.1
+/// build_daemon 4.1.0
 const _build_daemon = Package(
     name: 'build_daemon',
     description: 'A daemon for running Dart builds.',
     repository: 'https://github.com/dart-lang/build/tree/master/build_daemon',
     authors: [],
-    version: '4.1.1',
+    version: '4.1.0',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -730,14 +724,14 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// built_value 8.12.3
+/// built_value 8.12.0
 const _built_value = Package(
     name: 'built_value',
     description: '''Value types with builders, Dart classes as enums, and serialization. This library is the runtime dependency.
 ''',
     repository: 'https://github.com/google/built_value.dart/tree/master/built_value',
     authors: [],
-    version: '8.12.3',
+    version: '8.12.0',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -1191,54 +1185,13 @@ const _clock = Package(
    limitations under the License.''',
   );
 
-/// code_assets 1.0.0
+/// code_builder 4.11.0
-const _code_assets = Package(
-    name: 'code_assets',
-    description: 'This library contains the hook protocol specification for bundling native code with Dart packages.',
-    repository: 'https://github.com/dart-lang/native/tree/main/pkgs/code_assets',
-    authors: [],
-    version: '1.0.0',
-    spdxIdentifiers: ['BSD-3-Clause'],
-    isMarkdown: false,
-    isSdk: false,
-    dependencies: [PackageRef('collection'), PackageRef('hooks')],
-    devDependencies: [PackageRef('json_schema'), PackageRef('test')],
-    license: '''Copyright 2025, the Dart project authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
-  );
-
-/// code_builder 4.11.1
 const _code_builder = Package(
     name: 'code_builder',
     description: 'A fluent, builder-based library for generating valid Dart code.',
     repository: 'https://github.com/dart-lang/tools/tree/main/pkgs/code_builder',
     authors: [],
-    version: '4.11.1',
+    version: '4.11.0',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -1396,13 +1349,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// cross_file 0.3.5+2
+/// cross_file 0.3.5+1
 const _cross_file = Package(
     name: 'cross_file',
     description: 'An abstraction to allow working with files across multiple platforms.',
     repository: 'https://github.com/flutter/packages/tree/main/packages/cross_file',
     authors: [],
-    version: '0.3.5+2',
+    version: '0.3.5+1',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -1628,13 +1581,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// dbus 0.7.12
+/// dbus 0.7.11
 const _dbus = Package(
     name: 'dbus',
     description: 'A native Dart implementation of the D-Bus message bus client. This package allows Dart applications to directly access services on the Linux desktop.',
     homepage: 'https://github.com/canonical/dbus.dart',
     authors: [],
-    version: '0.7.12',
+    version: '0.7.11',
     spdxIdentifiers: ['MPL-2.0'],
     isMarkdown: false,
     isSdk: false,
@@ -2015,7 +1968,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   defined by the Mozilla Public License, v. 2.0.''',
   );
 
-/// dio 5.9.1
+/// dio 5.9.0
 const _dio = Package(
     name: 'dio',
     description: '''A powerful HTTP networking package,
@@ -2026,7 +1979,7 @@ Custom adapters, Transformers, etc.
     homepage: 'https://github.com/cfug/dio',
     repository: 'https://github.com/cfug/dio/blob/main/dio',
     authors: [],
-    version: '5.9.1',
+    version: '5.9.0',
     spdxIdentifiers: ['MIT'],
     isMarkdown: false,
     isSdk: false,
@@ -2416,13 +2369,13 @@ const _fake_async = Package(
    limitations under the License.''',
   );
 
-/// ffi 2.1.5
+/// ffi 2.1.4
 const _ffi = Package(
     name: 'ffi',
     description: 'Utilities for working with Foreign Function Interface (FFI) code.',
     repository: 'https://github.com/dart-lang/native/tree/main/pkgs/ffi',
     authors: [],
-    version: '2.1.5',
+    version: '2.1.4',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -2497,14 +2450,14 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// file_picker 10.3.10
+/// file_picker 10.3.7
 const _file_picker = Package(
     name: 'file_picker',
     description: 'A package that allows you to use a native file explorer to pick single or multiple absolute file paths, with extension filtering support.',
     homepage: 'https://github.com/miguelpruivo/plugins_flutter_file_picker',
     repository: 'https://github.com/miguelpruivo/flutter_file_picker',
     authors: [],
-    version: '10.3.10',
+    version: '10.3.7',
     spdxIdentifiers: ['MIT'],
     isMarkdown: false,
     isSdk: false,
@@ -2618,13 +2571,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// flutter 3.38.6
+/// flutter 3.38.4
 const _flutter = Package(
     name: 'flutter',
     description: 'A framework for writing Flutter applications',
     homepage: 'https://flutter.dev',
     authors: [],
-    version: '3.38.6',
+    version: '3.38.4',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: true,
@@ -2748,44 +2701,6 @@ const _flutter_web_plugins = Package(
     devDependencies: [],
   );
 
-/// fluttericon 2.0.0
-const _fluttericon = Package(
-    name: 'fluttericon',
-    description: 'Flutter icons from popular web icon fonts. Customize your final icon package using fluttericon.com.',
-    homepage: 'https://github.com/ilikerobots/fluttericon_pkg',
-    authors: [],
-    version: '2.0.0',
-    spdxIdentifiers: [],
-    isMarkdown: false,
-    isSdk: false,
-    dependencies: [PackageRef('flutter')],
-    devDependencies: [PackageRef('test'), PackageRef('recase')],
-    license: '''Copyright (c) 2020, Mike Hoolehan, StarHeight Media
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the StarHeight Media nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL HOOLEHAN OR STARHEIGHT MEDIA BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
-  );
-
 /// font_awesome_flutter 10.12.0
 const _font_awesome_flutter = Package(
     name: 'font_awesome_flutter',
@@ -2947,47 +2862,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// hooks 1.0.1
-const _hooks = Package(
-    name: 'hooks',
-    description: 'A library that contains a Dart API for the JSON-based protocol for `hook/build.dart` and `hook/link.dart`.',
-    repository: 'https://github.com/dart-lang/native/tree/main/pkgs/hooks',
-    authors: [],
-    version: '1.0.1',
-    spdxIdentifiers: ['BSD-3-Clause'],
-    isMarkdown: false,
-    isSdk: false,
-    dependencies: [PackageRef('collection'), PackageRef('crypto'), PackageRef('logging'), PackageRef('meta'), PackageRef('pub_semver'), PackageRef('yaml')],
-    devDependencies: [PackageRef('args'), PackageRef('code_assets'), PackageRef('glob'), PackageRef('json_schema'), PackageRef('path'), PackageRef('test')],
-    license: '''Copyright 2025, the Dart project authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
-  );
-
 /// html 0.15.6
 const _html = Package(
     name: 'html',
@@ -3271,13 +3145,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// json_annotation 4.10.0
+/// json_annotation 4.9.0
 const _json_annotation = Package(
     name: 'json_annotation',
     description: 'Classes and helper functions that support JSON code generation via the `json_serializable` package.',
     repository: 'https://github.com/google/json_serializable.dart/tree/master/json_annotation',
     authors: [],
-    version: '4.10.0',
+    version: '4.9.0',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -3947,47 +3821,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// native_toolchain_c 0.17.4
-const _native_toolchain_c = Package(
-    name: 'native_toolchain_c',
-    description: 'A library to invoke the native C compiler installed on the host machine.',
-    repository: 'https://github.com/dart-lang/native/tree/main/pkgs/native_toolchain_c',
-    authors: [],
-    version: '0.17.4',
-    spdxIdentifiers: ['BSD-3-Clause'],
-    isMarkdown: false,
-    isSdk: false,
-    dependencies: [PackageRef('code_assets'), PackageRef('glob'), PackageRef('hooks'), PackageRef('logging'), PackageRef('meta'), PackageRef('pub_semver')],
-    devDependencies: [PackageRef('collection'), PackageRef('test')],
-    license: '''Copyright 2023, the Dart project authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
-  );
-
 /// nested 1.0.0
 const _nested = Package(
     name: 'nested',
@@ -4085,47 +3918,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// objective_c 9.3.0
-const _objective_c = Package(
-    name: 'objective_c',
-    description: 'A library to access Objective C from Flutter that acts as a support library for package:ffigen.',
-    repository: 'https://github.com/dart-lang/native/tree/main/pkgs/objective_c',
-    authors: [],
-    version: '9.3.0',
-    spdxIdentifiers: ['BSD-3-Clause'],
-    isMarkdown: false,
-    isSdk: false,
-    dependencies: [PackageRef('code_assets'), PackageRef('collection'), PackageRef('ffi'), PackageRef('hooks'), PackageRef('logging'), PackageRef('native_toolchain_c'), PackageRef('pub_semver')],
-    devDependencies: [PackageRef('args'), PackageRef('path'), PackageRef('test'), PackageRef('yaml')],
-    license: '''Copyright 2024, the Dart project authors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of Google LLC nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
-  );
-
 /// package_config 2.2.0
 const _package_config = Package(
     name: 'package_config',
@@ -4372,13 +4164,13 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// path_provider_android 2.2.22
+/// path_provider_android 2.2.20
 const _path_provider_android = Package(
     name: 'path_provider_android',
     description: 'Android implementation of the path_provider plugin.',
     repository: 'https://github.com/flutter/packages/tree/main/packages/path_provider/path_provider_android',
     authors: [],
-    version: '2.2.22',
+    version: '2.2.20',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -4411,18 +4203,18 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// path_provider_foundation 2.6.0
+/// path_provider_foundation 2.4.3
 const _path_provider_foundation = Package(
     name: 'path_provider_foundation',
     description: 'iOS and macOS implementation of the path_provider plugin',
     repository: 'https://github.com/flutter/packages/tree/main/packages/path_provider/path_provider_foundation',
     authors: [],
-    version: '2.6.0',
+    version: '2.4.3',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
-    dependencies: [PackageRef('ffi'), PackageRef('flutter'), PackageRef('objective_c'), PackageRef('path_provider_platform_interface')],
+    dependencies: [PackageRef('flutter'), PackageRef('path_provider_platform_interface')],
-    devDependencies: [],
+    devDependencies: [PackageRef('build_runner'), PackageRef('path')],
     license: '''Copyright 2013 The Flutter Authors
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -5711,18 +5503,18 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// skeletonizer 2.1.2
+/// skeletonizer 2.1.1
 const _skeletonizer = Package(
     name: 'skeletonizer',
     description: 'Converts already built widgets into skeleton loaders with no extra effort.',
     homepage: 'https://github.com/Milad-Akarie/skeletonizer',
     authors: [],
-    version: '2.1.2',
+    version: '2.1.1',
     spdxIdentifiers: ['MIT'],
     isMarkdown: false,
     isSdk: false,
     dependencies: [PackageRef('flutter')],
-    devDependencies: [PackageRef('flutter_lints'), PackageRef('coverage')],
+    devDependencies: [PackageRef('flutter_lints')],
     license: '''MIT License
 
 Copyright (c) 2023 Milad Akarie
@@ -5869,13 +5661,13 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// source_span 1.10.2
+/// source_span 1.10.1
 const _source_span = Package(
     name: 'source_span',
     description: 'Provides a standard representation for source code locations and spans.',
     repository: 'https://github.com/dart-lang/tools/tree/main/pkgs/source_span',
     authors: [],
-    version: '1.10.2',
+    version: '1.10.1',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -5945,13 +5737,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.''',
   );
 
-/// sqlite3_flutter_libs 0.5.41
+/// sqlite3_flutter_libs 0.5.40
 const _sqlite3_flutter_libs = Package(
     name: 'sqlite3_flutter_libs',
     description: 'Flutter plugin to include native sqlite3 libraries with your app',
-    homepage: 'https://github.com/simolus3/sqlite3.dart/tree/v2/sqlite3_flutter_libs',
+    homepage: 'https://github.com/simolus3/sqlite3.dart/tree/main/sqlite3_flutter_libs',
     authors: [],
-    version: '0.5.41',
+    version: '0.5.40',
     spdxIdentifiers: ['MIT'],
     isMarkdown: false,
     isSdk: false,
@@ -5980,14 +5772,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.''',
   );
 
-/// sqlparser 0.42.1
+/// sqlparser 0.42.0
 const _sqlparser = Package(
     name: 'sqlparser',
     description: 'Parses sqlite statements and performs static analysis on them',
     homepage: 'https://github.com/simolus3/drift/tree/develop/sqlparser',
     repository: 'https://github.com/simolus3/drift',
     authors: [],
-    version: '0.42.1',
+    version: '0.42.0',
     spdxIdentifiers: ['MIT'],
     isMarkdown: false,
     isSdk: false,
@@ -6733,13 +6525,13 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// url_launcher_web 2.4.2
+/// url_launcher_web 2.4.1
 const _url_launcher_web = Package(
     name: 'url_launcher_web',
     description: 'Web platform implementation of url_launcher',
     repository: 'https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_web',
     authors: [],
-    version: '2.4.2',
+    version: '2.4.1',
     spdxIdentifiers: ['Apache-2.0', 'BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
@@ -6747,7 +6539,7 @@ const _url_launcher_web = Package(
     devDependencies: [],
     license: '''url_launcher_web
 
-Copyright 2013 The Flutter Authors
+Copyright 2013 The Flutter Authors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -7140,18 +6932,18 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''',
   );
 
-/// watcher 1.2.1
+/// watcher 1.1.4
 const _watcher = Package(
     name: 'watcher',
     description: 'A file system watcher. It monitors changes to contents of directories and sends notifications when files have been added, removed, or modified.',
     repository: 'https://github.com/dart-lang/tools/tree/main/pkgs/watcher',
     authors: [],
-    version: '1.2.1',
+    version: '1.1.4',
     spdxIdentifiers: ['BSD-3-Clause'],
     isMarkdown: false,
     isSdk: false,
     dependencies: [PackageRef('async'), PackageRef('path')],
-    devDependencies: [PackageRef('clock'), PackageRef('fake_async'), PackageRef('test')],
+    devDependencies: [PackageRef('test')],
     license: '''Copyright 2014, the Dart project authors. 
 
 Redistribution and use in source and binary forms, with or without
@@ -7359,7 +7151,7 @@ const _win32 = Package(
     isMarkdown: false,
     isSdk: false,
     dependencies: [PackageRef('ffi')],
-    devDependencies: [PackageRef('args'), PackageRef('hooks'), PackageRef('path'), PackageRef('test')],
+    devDependencies: [PackageRef('args'), PackageRef('path'), PackageRef('test')],
     license: '''BSD 3-Clause License
 
 Copyright (c) 2024, Halil Durmus
@@ -7499,181 +7291,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.''',
   );
 
-/// tallee 0.0.16+250
+/// game_tracker 0.0.5+127
-const _tallee = Package(
+const _game_tracker = Package(
-    name: 'tallee',
+    name: 'game_tracker',
-    description: 'Tracking App for Card Games',
+    description: 'Game Tracking App for Card Games',
     authors: [],
-    version: '0.0.16+250',
+    version: '0.0.5+127',
-    spdxIdentifiers: ['LGPL-3.0'],
+    spdxIdentifiers: [],
     isMarkdown: false,
     isSdk: false,
-    dependencies: [PackageRef('flutter'), PackageRef('clock'), PackageRef('cupertino_icons'), PackageRef('drift'), PackageRef('drift_flutter'), PackageRef('file_picker'), PackageRef('file_saver'), PackageRef('fluttericon'), PackageRef('font_awesome_flutter'), PackageRef('intl'), PackageRef('json_schema'), PackageRef('package_info_plus'), PackageRef('path_provider'), PackageRef('provider'), PackageRef('skeletonizer'), PackageRef('url_launcher'), PackageRef('uuid')],
+    dependencies: [PackageRef('flutter'), PackageRef('clock'), PackageRef('cupertino_icons'), PackageRef('drift'), PackageRef('drift_flutter'), PackageRef('file_picker'), PackageRef('file_saver'), PackageRef('font_awesome_flutter'), PackageRef('intl'), PackageRef('json_schema'), PackageRef('package_info_plus'), PackageRef('path_provider'), PackageRef('provider'), PackageRef('skeletonizer'), PackageRef('url_launcher'), PackageRef('uuid')],
     devDependencies: [PackageRef('build_runner'), PackageRef('dart_pubspec_licenses'), PackageRef('drift_dev'), PackageRef('flutter_lints')],
-    license: '''GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.''',
   );
 

lib/presentation/views/main_menu/settings_view/licenses_view.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/core/custom_theme.dart';
+import 'package:game_tracker/core/custom_theme.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
+import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
-import 'package:tallee/presentation/widgets/tiles/license_tile.dart';
+import 'package:game_tracker/presentation/widgets/tiles/license_tile.dart';
 
 class LicensesView extends StatelessWidget {
   /// A view that displays a list of open source licenses used in the app

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

@@ -3,16 +3,16 @@ import 'dart:io';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:game_tracker/core/enums.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses_view.dart';
+import 'package:game_tracker/presentation/widgets/buttons/animated_dialog_button.dart';
+import 'package:game_tracker/presentation/widgets/custom_alert_dialog.dart';
+import 'package:game_tracker/presentation/widgets/tiles/settings_list_tile.dart';
+import 'package:game_tracker/services/data_transfer_service.dart';
 import 'package:intl/intl.dart';
 import 'package:package_info_plus/package_info_plus.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/core/enums.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/views/main_menu/settings_view/licenses_view.dart';
-import 'package:tallee/presentation/widgets/buttons/animated_dialog_button.dart';
-import 'package:tallee/presentation/widgets/custom_alert_dialog.dart';
-import 'package:tallee/presentation/widgets/tiles/settings_list_tile.dart';
-import 'package:tallee/services/data_transfer_service.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class SettingsView extends StatefulWidget {
@@ -31,7 +31,6 @@ class _SettingsViewState extends State<SettingsView> {
     version: 'n.A.',
     buildNumber: 'n.A.',
   );
-
   @override
   void initState() {
     super.initState();
@@ -89,7 +88,7 @@ class _SettingsViewState extends State<SettingsView> {
                           );
                       final result = await DataTransferService.exportData(
                         json,
-                        'tallee-data',
+                        'game_tracker-data',
                       );
                       if (!scaffoldMessengerContext.mounted) return;
                       showExportSnackBar(
@@ -137,7 +136,7 @@ class _SettingsViewState extends State<SettingsView> {
                               onPressed: () => Navigator.of(context).pop(true),
                               child: Text(
                                 loc.delete,
-                                style: const TextStyle(
+                                style: TextStyle(
                                   color: CustomTheme.secondaryColor,
                                 ),
                               ),

lib/presentation/views/main_menu/statistics_view.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/constants.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/dto/match.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
+import 'package:game_tracker/presentation/widgets/tiles/statistics_tile.dart';
+import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 import 'package:provider/provider.dart';
-import 'package:tallee/core/constants.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/match.dart';
-import 'package:tallee/data/dto/player.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/widgets/app_skeleton.dart';
-import 'package:tallee/presentation/widgets/tiles/statistics_tile.dart';
-import 'package:tallee/presentation/widgets/top_centered_message.dart';
 
 class StatisticsView extends StatefulWidget {
   /// A view that displays player statistics

lib/presentation/widgets/buttons/animated_dialog_button.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/core/custom_theme.dart';
+import 'package:game_tracker/core/custom_theme.dart';
 
 class AnimatedDialogButton extends StatefulWidget {
   /// A custom animated button widget that provides a scaling and opacity effect

lib/presentation/widgets/buttons/custom_width_button.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/core/custom_theme.dart';
+import 'package:game_tracker/core/custom_theme.dart';
-import 'package:tallee/core/enums.dart';
+import 'package:game_tracker/core/enums.dart';
 
 class CustomWidthButton extends StatelessWidget {
   /// A custom button widget that is designed to have a width relative to the screen size.

lib/presentation/widgets/buttons/main_menu_button.dart

@@ -2,25 +2,25 @@ import 'package:flutter/material.dart';
 
 class MainMenuButton extends StatefulWidget {
   /// A button for the main menu with an optional icon and a press animation.
-  /// - [onPressed]: The callback to be invoked when the button is pressed.
-  /// - [icon]: The icon of the button.
   /// - [text]: The text of the button.
+  /// - [icon]: The icon of the button.
+  /// - [onPressed]: The callback to be invoked when the button is pressed.
   const MainMenuButton({
     super.key,
+    required this.text,
+    this.icon,
     required this.onPressed,
-    required this.icon,
-    this.text,
   });
 
+  /// The text of the button.
+  final String text;
+
+  /// The icon of the button.
+  final IconData? icon;
+
   /// The callback to be invoked when the button is pressed.
   final void Function() onPressed;
 
-  /// The icon of the button.
-  final IconData icon;
-
-  /// The text of the button.
-  final String? text;
-
   @override
   State<MainMenuButton> createState() => _MainMenuButtonState();
 }
@@ -71,18 +71,18 @@ class _MainMenuButtonState extends State<MainMenuButton>
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Icon(widget.icon, size: 26, color: Colors.black),
+              if (widget.icon != null) ...[
-              if (widget.text != null) ...[
+                Icon(widget.icon, size: 26, color: Colors.black),
                 const SizedBox(width: 7),
-                Text(
-                  widget.text!,
-                  style: const TextStyle(
-                    fontSize: 18,
-                    fontWeight: FontWeight.bold,
-                    color: Colors.black,
-                  ),
-                ),
               ],
+              Text(
+                widget.text,
+                style: const TextStyle(
+                  fontSize: 18,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.black,
+                ),
+              ),
             ],
           ),
         ),

lib/presentation/widgets/buttons/quick_create_button.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/core/custom_theme.dart';
+import 'package:game_tracker/core/custom_theme.dart';
 
 class QuickCreateButton extends StatefulWidget {
   /// A button widget designed for quick creating matches in the [HomeView]
@@ -28,18 +28,14 @@ class _QuickCreateButtonState extends State<QuickCreateButton> {
       onPressed: widget.onPressed,
       style: ElevatedButton.styleFrom(
         minimumSize: const Size(140, 45),
-        backgroundColor: CustomTheme.primaryColor.withAlpha(200).withBlue(40),
+        backgroundColor: CustomTheme.primaryColor,
         shape: RoundedRectangleBorder(
           borderRadius: CustomTheme.standardBorderRadiusAll,
         ),
       ),
       child: Text(
         widget.text,
-        style: const TextStyle(
+        style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
-          color: CustomTheme.textColor,
-          fontWeight: FontWeight.bold,
-          fontSize: 16,
-        ),
       ),
     );
   }

lib/presentation/widgets/colored_icon_container.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/cupertino.dart';
-import 'package:tallee/core/custom_theme.dart';
+import 'package:game_tracker/core/custom_theme.dart';
 
 class ColoredIconContainer extends StatelessWidget {
   /// A customizable container widget that displays an icon with a colored background.
@@ -48,7 +48,7 @@ class ColoredIconContainer extends StatelessWidget {
           child: Icon(
             icon,
             size: iconSize,
-            color: CustomTheme.primaryColor.withBlue(40),
+            color: CustomTheme.primaryColor.withGreen(40),
           ),
         ),
       ],

lib/presentation/widgets/custom_alert_dialog.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/core/custom_theme.dart';
+import 'package:game_tracker/core/custom_theme.dart';
 
 class CustomAlertDialog extends StatelessWidget {
   /// A custom alert dialog widget that provides a os unspecific AlertDialog,
@@ -32,7 +32,7 @@ class CustomAlertDialog extends StatelessWidget {
       actionsAlignment: MainAxisAlignment.spaceAround,
       shape: RoundedRectangleBorder(
         borderRadius: CustomTheme.standardBorderRadiusAll,
-        side: const BorderSide(color: CustomTheme.boxBorderColor),
+        side: BorderSide(color: CustomTheme.boxBorder),
       ),
     );
   }

lib/presentation/widgets/navbar_item.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:tallee/core/custom_theme.dart';
+import 'package:game_tracker/core/custom_theme.dart';
 
 class NavbarItem extends StatefulWidget {
   /// A navigation bar item widget that represents a single tab in a navigation bar.
@@ -87,29 +87,19 @@ class _NavbarItemState extends State<NavbarItem>
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              AnimatedContainer(
+              ScaleTransition(
-                width: 50,
+                scale: widget.isSelected
-                height: 50,
+                    ? _scaleAnimation
-                decoration: BoxDecoration(
+                    : const AlwaysStoppedAnimation(1.0),
+                child: Icon(
+                  widget.icon,
                   color: widget.isSelected
-                      ? CustomTheme.primaryColor.withAlpha(50)
+                      ? CustomTheme.navBarItemSelectedColor
-                      : Colors.transparent,
+                      : CustomTheme.navBarItemUnselectedColor,
-                  borderRadius: const BorderRadius.all(Radius.circular(15)),
+                  size: 32,
-                ),
-                duration: const Duration(milliseconds: 200),
-                child: ScaleTransition(
-                  scale: widget.isSelected
-                      ? _scaleAnimation
-                      : const AlwaysStoppedAnimation(1.0),
-                  child: Icon(
-                    widget.icon,
-                    color: widget.isSelected
-                        ? CustomTheme.navBarItemSelectedColor
-                        : CustomTheme.navBarItemUnselectedColor,
-                    size: 32,
-                  ),
                 ),
               ),
+              const SizedBox(height: 4),
               Text(
                 widget.label,
                 style: TextStyle(

lib/presentation/widgets/player_selection.dart

@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/constants.dart';
+import 'package:game_tracker/core/custom_theme.dart';
+import 'package:game_tracker/data/db/database.dart';
+import 'package:game_tracker/data/dto/player.dart';
+import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:game_tracker/presentation/widgets/app_skeleton.dart';
+import 'package:game_tracker/presentation/widgets/text_input/custom_search_bar.dart';
+import 'package:game_tracker/presentation/widgets/tiles/text_icon_list_tile.dart';
+import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
+import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
 import 'package:provider/provider.dart';
-import 'package:tallee/core/constants.dart';
-import 'package:tallee/core/custom_theme.dart';
-import 'package:tallee/data/db/database.dart';
-import 'package:tallee/data/dto/player.dart';
-import 'package:tallee/l10n/generated/app_localizations.dart';
-import 'package:tallee/presentation/widgets/app_skeleton.dart';
-import 'package:tallee/presentation/widgets/text_input/custom_search_bar.dart';
-import 'package:tallee/presentation/widgets/tiles/text_icon_list_tile.dart';
-import 'package:tallee/presentation/widgets/tiles/text_icon_tile.dart';
-import 'package:tallee/presentation/widgets/top_centered_message.dart';
 
 class PlayerSelection extends StatefulWidget {
   /// A widget that allows users to select players from a list,
@@ -70,7 +70,6 @@ class _PlayerSelectionState extends State<PlayerSelection> {
     super.initState();
     db = Provider.of<AppDatabase>(context, listen: false);
     suggestedPlayers = skeletonData;
-    selectedPlayers = widget.initialSelectedPlayers ?? [];
     loadPlayerList();
   }
 
@@ -101,7 +100,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                 if (value.isEmpty) {
                   // If the search is empty, it shows all unselected players.
                   suggestedPlayers = allPlayers.where((player) {
-                    return !selectedPlayers.any((p) => p.id == player.id);
+                    return !selectedPlayers.contains(player);
                   }).toList();
                 } else {
                   // If there is input, it filters by name match (case-insensitive) and ensures
@@ -110,7 +109,9 @@ class _PlayerSelectionState extends State<PlayerSelection> {
                     final bool nameMatches = player.name.toLowerCase().contains(
                       value.toLowerCase(),
                     );
-                    final bool isNotSelected = !selectedPlayers.any((p) => p.id == player.id);
+                    final bool isNotSelected = !selectedPlayers.contains(
+                      player,
+                    );
                     return nameMatches && isNotSelected;
                   }).toList();
                 }
@@ -125,49 +126,46 @@ class _PlayerSelectionState extends State<PlayerSelection> {
           const SizedBox(height: 10),
           SizedBox(
             height: 50,
-            child: AppSkeleton(
+            child: selectedPlayers.isEmpty
-              enabled: isLoading,
+                ? Center(child: Text(loc.no_players_selected))
-              child: selectedPlayers.isEmpty
+                : SingleChildScrollView(
-                  ? Center(child: Text(loc.no_players_selected))
+                    scrollDirection: Axis.horizontal,
-                  : SingleChildScrollView(
+                    child: Row(
-                      scrollDirection: Axis.horizontal,
+                      children: [
-                      child: Row(
+                        for (var player in selectedPlayers)
-                        children: [
+                          Padding(
-                          for (var player in selectedPlayers)
+                            padding: const EdgeInsets.only(right: 8.0),
-                            Padding(
+                            child: TextIconTile(
-                              padding: const EdgeInsets.only(right: 8.0),
+                              text: player.name,
-                              child: TextIconTile(
+                              onIconTap: () {
-                                text: player.name,
+                                setState(() {
-                                onIconTap: () {
+                                  // Removes the player from the selection and notifies the parent.
-                                  setState(() {
+                                  selectedPlayers.remove(player);
-                                    // Removes the player from the selection and notifies the parent.
+                                  widget.onChanged([...selectedPlayers]);
-                                    selectedPlayers.remove(player);
-                                    widget.onChanged([...selectedPlayers]);
 
-                                    // Get the current search query
+                                  // Get the current search query
-                                    final currentSearch = _searchBarController
+                                  final currentSearch = _searchBarController
-                                        .text
+                                      .text
-                                        .toLowerCase();
+                                      .toLowerCase();
 
-                                    // If the player matches the current search query (or search is empty),
+                                  // If the player matches the current search query (or search is empty),
-                                    // they are added back to the `suggestedPlayers` and the list is re-sorted.
+                                  // they are added back to the `suggestedPlayers` and the list is re-sorted.
-                                    if (currentSearch.isEmpty ||
+                                  if (currentSearch.isEmpty ||
-                                        player.name.toLowerCase().contains(
+                                      player.name.toLowerCase().contains(
-                                          currentSearch,
+                                        currentSearch,
-                                        )) {
+                                      )) {
-                                      suggestedPlayers.add(player);
+                                    suggestedPlayers.add(player);
-                                      suggestedPlayers.sort(
+                                    suggestedPlayers.sort(
-                                        (a, b) => a.name.compareTo(b.name),
+                                      (a, b) => a.name.compareTo(b.name),
-                                      );
+                                    );
-                                    }
+                                  }
-                                  });
+                                });
-                                },
+                              },
-                              ),
                             ),
-                        ],
+                          ),
-                      ),
+                      ],
                     ),
-            ),
+                  ),
           ),
           const SizedBox(height: 10),
           Text(
@@ -247,21 +245,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
             // Otherwise, use the loaded players from the database.
             loadedPlayers.sort((a, b) => a.name.compareTo(b.name));
             allPlayers = [...loadedPlayers];
-            if (widget.initialSelectedPlayers != null) {
+            suggestedPlayers = [...loadedPlayers];
-              // Excludes already selected players from the suggested players list.
-              suggestedPlayers = loadedPlayers.where((p) => !widget.initialSelectedPlayers!.any((ip) => ip.id == p.id)).toList();
-              // Ensures that only players available for selection are pre-selected.
-              selectedPlayers = widget.initialSelectedPlayers!
-                  .where(
-                    (p) => allPlayers.any(
-                      (available) => available.id == p.id,
-                ),
-              )
-                  .toList();
-            } else {
-              // If no initial selection, all loaded players are suggested.
-              suggestedPlayers = [...loadedPlayers];
-            }
           }
           isLoading = false;
         });