diff --git a/.gitea/workflows/pull_request.yaml b/.gitea/workflows/pull_request.yaml
index 5b88cdf..26f4404 100644
--- a/.gitea/workflows/pull_request.yaml
+++ b/.gitea/workflows/pull_request.yaml
@@ -6,42 +6,52 @@ on:
jobs:
lint:
runs-on: ubuntu-latest
-
steps:
- name: Checkout code
uses: actions/checkout@v4
- - name: Install Flutter (wget)
+ # Required for Flutter action
+ - name: Install jq
run: |
- wget --show-progress --progress=bar:force:noscroll:giga https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
- tar xf flutter_linux_3.38.2-stable.tar.xz
- git config --global --add safe.directory "$(pwd)/flutter"
- echo "$(pwd)/flutter/bin" >> $GITEA_PATH
+ 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: flutter pub get
+ run: |
+ 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
test:
runs-on: ubuntu-latest
- env:
- RUNNER_TOOL_CACHE: /toolcache
-
steps:
- name: Checkout code
uses: actions/checkout@v4
- - name: Install Flutter (wget)
+ # Required for Flutter action
+ - name: Install jq
run: |
- wget --show-progress --progress=bar:force:noscroll:giga https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
- tar xf flutter_linux_3.38.2-stable.tar.xz
- git config --global --add safe.directory "$(pwd)/flutter"
- echo "$(pwd)/flutter/bin" >> $GITEA_PATH
+ 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: flutter pub get
+ run: |
+ git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
+ flutter pub get
- name: Run tests
run: flutter test
diff --git a/.gitea/workflows/push.yaml b/.gitea/workflows/push.yaml
index 20319e2..f330b2a 100644
--- a/.gitea/workflows/push.yaml
+++ b/.gitea/workflows/push.yaml
@@ -7,40 +7,166 @@ 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
- - name: Install Flutter (wget)
+ # Required for Flutter action
+ - name: Install jq
run: |
- wget --show-progress --progress=bar:force:noscroll:giga https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
- tar xf flutter_linux_3.38.2-stable.tar.xz
- git config --global --add safe.directory "$(pwd)/flutter"
- echo "$(pwd)/flutter/bin" >> $GITEA_PATH
+ 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: flutter pub get
+ 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 }}
+
+ # 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]
steps:
- name: Checkout code
uses: actions/checkout@v4
- - name: Install Flutter (wget)
+ # Required for Flutter action
+ - name: Install jq
run: |
- wget --show-progress --progress=bar:force:noscroll:giga https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
- tar xf flutter_linux_3.38.2-stable.tar.xz
- git config --global --add safe.directory "$(pwd)/flutter"
- echo "$(pwd)/flutter/bin" >> $GITEA_PATH
+ 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: flutter pub get
+ run: |
+ git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.38.6-x64
+ flutter pub get
- name: Check code format
id: check_format
@@ -61,6 +187,8 @@ jobs:
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 "Auto-format code [skip ci]"
git push origin HEAD:${{ gitea.ref_name }}
@@ -69,33 +197,4 @@ jobs:
fi
- name: Verify format
- run: flutter analyze lib test
-
- update_version:
- runs-on: ubuntu-latest
- needs: format
- 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: https://github.com/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 add pubspec.yaml
- git commit -m "Updated version number [skip ci]"
- git push origin HEAD:${{ gitea.ref_name }}
\ No newline at end of file
+ run: flutter analyze lib test
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..d6e91f5
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,13 @@
+# Contributing
+
+## Code of Conduct
+
+``
+
+## Code Style
+
+``
+
+## Repository structure
+
+``
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..153d416
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ 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.
\ No newline at end of file
diff --git a/README.md b/README.md
index 4d5b30c..70ab8e6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,63 @@
-# Game Tracker
+
+
+
Tallee
+
+
+An open-source app to track card- and board games, manage players & groups and get statistics about your played games.
+
+
+## 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
+
+
+
+
+
+
+## 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).
+
+
-
-
-
-A all-in-one app to track card- and board games, manage players and groups and get statistics about your played games.
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index edde6d6..0d5c4b8 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
}
android {
- namespace = "com.example.game_tracker"
+ namespace = "de.liquid.tallee"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion
@@ -21,7 +21,7 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId = "com.example.game_tracker"
+ applicationId = "de.liquid.tallee"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 3c48c4a..e722349 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
- #E6F1E4
- #0B0B0B
+ #ef681f
\ No newline at end of file
diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml
index 2971c37..fd4cd85 100644
--- a/android/app/src/main/res/values/ic_launcher_background.xml
+++ b/android/app/src/main/res/values/ic_launcher_background.xml
@@ -1,5 +1,4 @@
-
- @color/app_icon_background
+ #EF681F
\ No newline at end of file
diff --git a/artefacts/app-logo.png b/artefacts/app-logo.png
new file mode 100644
index 0000000..a89cc43
Binary files /dev/null and b/artefacts/app-logo.png differ
diff --git a/artefacts/screenshot-1.png b/artefacts/screenshot-1.png
new file mode 100644
index 0000000..34e75bd
Binary files /dev/null and b/artefacts/screenshot-1.png differ
diff --git a/artefacts/screenshot-2.png b/artefacts/screenshot-2.png
new file mode 100644
index 0000000..541be8b
Binary files /dev/null and b/artefacts/screenshot-2.png differ
diff --git a/artefacts/screenshot-3.png b/artefacts/screenshot-3.png
new file mode 100644
index 0000000..bfa3b7e
Binary files /dev/null and b/artefacts/screenshot-3.png differ
diff --git a/artefacts/screenshot-4.png b/artefacts/screenshot-4.png
new file mode 100644
index 0000000..ef00e29
Binary files /dev/null and b/artefacts/screenshot-4.png differ
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 8358b1c..27638af 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -152,7 +152,6 @@
B68CF4A64F0B5E45B43D6900 /* Pods-RunnerTests.release.xcconfig */,
E754D1191B3E54E52B6DCC49 /* Pods-RunnerTests.profile.xcconfig */,
);
- name = Pods;
path = Pods;
sourceTree = "";
};
@@ -478,7 +477,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker;
+ PRODUCT_BUNDLE_IDENTIFIER = de.liquid.tallee;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
@@ -661,7 +660,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker;
+ PRODUCT_BUNDLE_IDENTIFIER = de.liquid.tallee;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -684,7 +683,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker;
+ PRODUCT_BUNDLE_IDENTIFIER = de.liquid.tallee;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png
new file mode 100644
index 0000000..94edbb6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png
new file mode 100644
index 0000000..11f8618
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png
new file mode 100644
index 0000000..165a8a8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png
new file mode 100644
index 0000000..b346952
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png
new file mode 100644
index 0000000..8745a0f
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png
new file mode 100644
index 0000000..9b48058
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png
new file mode 100644
index 0000000..11c79f1
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png
new file mode 100644
index 0000000..6a99099
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png
new file mode 100644
index 0000000..ec9f3f6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png
new file mode 100644
index 0000000..ee015b2
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png
new file mode 100644
index 0000000..ebb1b76
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index 45d1e86..73d3b7f 100644
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,14 +1 @@
-{
- "images" : [
- {
- "filename" : "icon_x1024.png",
- "idiom" : "universal",
- "platform" : "ios",
- "size" : "1024x1024"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]}
\ No newline at end of file
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_x1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_x1024.png
deleted file mode 100644
index 1abba4a..0000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_x1024.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/LauncherBackgroundColor.colorset/Contents.json b/ios/Runner/Assets.xcassets/LauncherColor.colorset/Contents.json
similarity index 74%
rename from ios/Runner/Assets.xcassets/LauncherBackgroundColor.colorset/Contents.json
rename to ios/Runner/Assets.xcassets/LauncherColor.colorset/Contents.json
index 41fe6c8..7356209 100644
--- a/ios/Runner/Assets.xcassets/LauncherBackgroundColor.colorset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LauncherColor.colorset/Contents.json
@@ -5,9 +5,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
- "blue" : "0.043",
- "green" : "0.043",
- "red" : "0.043"
+ "blue" : "0.122",
+ "green" : "0.408",
+ "red" : "0.937"
}
},
"idiom" : "universal"
diff --git a/ios/Runner/Assets.xcassets/LauncherIcon.imageset/Contents.json b/ios/Runner/Assets.xcassets/LauncherIcon.imageset/Contents.json
index 2945b36..06ddd98 100644
--- a/ios/Runner/Assets.xcassets/LauncherIcon.imageset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LauncherIcon.imageset/Contents.json
@@ -1,17 +1,8 @@
{
"images" : [
{
- "filename" : "icon.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
+ "filename" : "icon-transparent.png",
+ "idiom" : "universal"
}
],
"info" : {
diff --git a/ios/Runner/Assets.xcassets/LauncherIcon.imageset/icon-transparent.png b/ios/Runner/Assets.xcassets/LauncherIcon.imageset/icon-transparent.png
new file mode 100644
index 0000000..f926570
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LauncherIcon.imageset/icon-transparent.png differ
diff --git a/ios/Runner/Assets.xcassets/LauncherIcon.imageset/icon.png b/ios/Runner/Assets.xcassets/LauncherIcon.imageset/icon.png
deleted file mode 100644
index ee71baa..0000000
Binary files a/ios/Runner/Assets.xcassets/LauncherIcon.imageset/icon.png and /dev/null differ
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
index fb29ee2..28d0ddf 100644
--- a/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -1,9 +1,9 @@
-
+
-
+
@@ -20,12 +20,19 @@
+
-
+
@@ -36,8 +43,8 @@
-
-
+
+
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 8db75d8..7e79382 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -2,10 +2,12 @@
+ CADisableMinimumFrameDurationOnPhone
+ CFBundleDevelopmentRegion$(DEVELOPMENT_LANGUAGE)CFBundleDisplayName
- Game Tracker
+ TalleeCFBundleExecutable$(EXECUTABLE_NAME)CFBundleIdentifier
@@ -13,7 +15,7 @@
CFBundleInfoDictionaryVersion6.0CFBundleName
- game_tracker
+ talleeCFBundlePackageTypeAPPLCFBundleShortVersionString
@@ -22,13 +24,15 @@
????CFBundleVersion$(FLUTTER_BUILD_NUMBER)
+ LSApplicationQueriesSchemes
+
+ https
+ http
+ LSRequiresIPhoneOS
- LSApplicationQueriesSchemes
-
- https
- http
-
+ UIApplicationSupportsIndirectInputEvents
+ UILaunchStoryboardNameLaunchScreenUIMainStoryboardFile
@@ -44,9 +48,5 @@
UIInterfaceOrientationLandscapeLeftUIInterfaceOrientationLandscapeRight
- CADisableMinimumFrameDurationOnPhone
-
- UIApplicationSupportsIndirectInputEvents
-
-
\ No newline at end of file
+
diff --git a/lib/core/custom_theme.dart b/lib/core/custom_theme.dart
index 2c18073..9400d3d 100644
--- a/lib/core/custom_theme.dart
+++ b/lib/core/custom_theme.dart
@@ -7,25 +7,25 @@ class CustomTheme {
// ==================== Colors ====================
/// Primary color of the app theme
- static Color primaryColor = const Color(0xFF7505E4);
+ static const Color primaryColor = Color(0xFFef681f);
/// Secondary color of the app theme
- static Color secondaryColor = const Color(0xFFAFA2FF);
+ static const Color secondaryColor = Color(0xFFf2a981);
/// Background color of the app theme
- static Color backgroundColor = const Color(0xFF0B0B0B);
+ static const backgroundColor = Color(0xFF0B0B0B);
/// Default color for boxes and containers
- static Color boxColor = const Color(0xFF101010);
+ static const Color boxColor = Color(0xFF101010);
/// Default border color for boxes and containers
- static Color boxBorder = const Color(0xFF272727);
+ static const Color boxBorder = Color(0xFF272727);
/// Color for boxes and containers displayed on boxes
- static Color onBoxColor = const Color(0xFF181818);
+ static const Color onBoxColor = Color(0xFF181818);
/// Text color used throughout the app
- static const Color textColor = Colors.white;
+ static const Color textColor = Color(0xFFFFFFFF);
/// Selected color for the [NavbarItem]
static Color navBarItemSelectedColor = primaryColor.withGreen(100);
@@ -63,18 +63,18 @@ class CustomTheme {
);
// ==================== App Bar Theme ====================
- static AppBarTheme appBarTheme = AppBarTheme(
+ static const AppBarTheme appBarTheme = AppBarTheme(
backgroundColor: backgroundColor,
foregroundColor: textColor,
elevation: 0,
scrolledUnderElevation: 0,
centerTitle: true,
- titleTextStyle: const TextStyle(
+ titleTextStyle: TextStyle(
color: textColor,
fontSize: 20,
fontWeight: FontWeight.bold,
overflow: TextOverflow.ellipsis,
),
- iconTheme: const IconThemeData(color: textColor),
+ iconTheme: IconThemeData(color: textColor),
);
}
diff --git a/lib/core/enums.dart b/lib/core/enums.dart
index ee8b445..a6bf274 100644
--- a/lib/core/enums.dart
+++ b/lib/core/enums.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
+import 'package:tallee/l10n/generated/app_localizations.dart';
/// Button types used for styling the [CustomWidthButton]
/// - [ButtonType.primary]: Primary button style.
diff --git a/lib/data/dao/group_dao.dart b/lib/data/dao/group_dao.dart
index cd45c12..7b52ceb 100644
--- a/lib/data/dao/group_dao.dart
+++ b/lib/data/dao/group_dao.dart
@@ -1,9 +1,9 @@
import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/group_table.dart';
-import 'package:game_tracker/data/db/tables/player_group_table.dart';
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/group_table.dart';
+import 'package:tallee/data/db/tables/player_group_table.dart';
+import 'package:tallee/data/dto/group.dart';
+import 'package:tallee/data/dto/player.dart';
part 'group_dao.g.dart';
diff --git a/lib/data/dao/match_dao.dart b/lib/data/dao/match_dao.dart
index 2df0bb9..06dd335 100644
--- a/lib/data/dao/match_dao.dart
+++ b/lib/data/dao/match_dao.dart
@@ -1,13 +1,9 @@
import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/game_table.dart';
-import 'package:game_tracker/data/db/tables/group_table.dart';
-import 'package:game_tracker/data/db/tables/match_table.dart';
-import 'package:game_tracker/data/db/tables/player_match_table.dart';
-import 'package:game_tracker/data/dto/game.dart';
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/data/dto/match.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/match_table.dart';
+import 'package:tallee/data/dto/group.dart';
+import 'package:tallee/data/dto/match.dart';
+import 'package:tallee/data/dto/player.dart';
part 'match_dao.g.dart';
@@ -114,20 +110,20 @@ class MatchDao extends DatabaseAccessor with _$MatchDaoMixin {
if (uniqueGames.isNotEmpty) {
await db.batch(
- (b) => b.insertAll(
+ (b) => b.insertAll(
db.gameTable,
uniqueGames.values
.map(
(game) => GameTableCompanion.insert(
- id: game.id,
- name: game.name,
- ruleset: game.ruleset.name,
- description: game.description,
- color: game.color,
- icon: game.icon,
- createdAt: game.createdAt,
- ),
- )
+ id: game.id,
+ name: game.name,
+ ruleset: game.ruleset.name,
+ description: game.description,
+ color: game.color,
+ icon: game.icon,
+ createdAt: game.createdAt,
+ ),
+ )
.toList(),
mode: InsertMode.insertOrIgnore,
),
@@ -136,18 +132,18 @@ class MatchDao extends DatabaseAccessor with _$MatchDaoMixin {
// Add all groups of the matches in batch
await db.batch(
- (b) => b.insertAll(
+ (b) => b.insertAll(
db.groupTable,
matches
.where((match) => match.group != null)
.map(
(match) => GroupTableCompanion.insert(
- id: match.group!.id,
- name: match.group!.name,
- description: match.group!.description,
- createdAt: match.group!.createdAt,
- ),
- )
+ id: match.group!.id,
+ name: match.group!.name,
+ description: match.group!.description,
+ createdAt: match.group!.createdAt,
+ ),
+ )
.toList(),
mode: InsertMode.insertOrIgnore,
),
@@ -155,19 +151,19 @@ class MatchDao extends DatabaseAccessor with _$MatchDaoMixin {
// Add all matches in batch
await db.batch(
- (b) => b.insertAll(
+ (b) => b.insertAll(
matchTable,
matches
.map(
(match) => MatchTableCompanion.insert(
- id: match.id,
- gameId: match.game.id,
- groupId: Value(match.group?.id),
- name: Value(match.name),
- notes: Value(match.notes),
- createdAt: match.createdAt,
- ),
- )
+ id: match.id,
+ gameId: match.game.id,
+ groupId: Value(match.group?.id),
+ name: Value(match.name),
+ notes: Value(match.notes),
+ createdAt: match.createdAt,
+ ),
+ )
.toList(),
mode: InsertMode.insertOrReplace,
),
@@ -191,17 +187,17 @@ class MatchDao extends DatabaseAccessor with _$MatchDaoMixin {
if (uniquePlayers.isNotEmpty) {
await db.batch(
- (b) => b.insertAll(
+ (b) => b.insertAll(
db.playerTable,
uniquePlayers.values
.map(
(p) => PlayerTableCompanion.insert(
- id: p.id,
- name: p.name,
- description: p.description,
- createdAt: p.createdAt,
- ),
- )
+ id: p.id,
+ name: p.name,
+ description: p.description,
+ createdAt: p.createdAt,
+ ),
+ )
.toList(),
mode: InsertMode.insertOrIgnore,
),
@@ -258,9 +254,9 @@ class MatchDao extends DatabaseAccessor with _$MatchDaoMixin {
/// Retrieves the number of matches in the database.
Future getMatchCount() async {
final count =
- await (selectOnly(matchTable)..addColumns([matchTable.id.count()]))
- .map((row) => row.read(matchTable.id.count()))
- .getSingle();
+ await (selectOnly(matchTable)..addColumns([matchTable.id.count()]))
+ .map((row) => row.read(matchTable.id.count()))
+ .getSingle();
return count ?? 0;
}
@@ -381,4 +377,4 @@ class MatchDao extends DatabaseAccessor with _$MatchDaoMixin {
// TODO: Implement winner persistence
return true;
}
-}
+}
\ No newline at end of file
diff --git a/lib/data/dao/player_dao.dart b/lib/data/dao/player_dao.dart
index e6607a4..2da9761 100644
--- a/lib/data/dao/player_dao.dart
+++ b/lib/data/dao/player_dao.dart
@@ -1,7 +1,7 @@
import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/player_table.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/player_table.dart';
+import 'package:tallee/data/dto/player.dart';
part 'player_dao.g.dart';
diff --git a/lib/data/dao/player_group_dao.dart b/lib/data/dao/player_group_dao.dart
index 03e26f2..c3889c8 100644
--- a/lib/data/dao/player_group_dao.dart
+++ b/lib/data/dao/player_group_dao.dart
@@ -1,8 +1,8 @@
import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/player_group_table.dart';
-import 'package:game_tracker/data/db/tables/player_table.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/player_group_table.dart';
+import 'package:tallee/data/db/tables/player_table.dart';
+import 'package:tallee/data/dto/player.dart';
part 'player_group_dao.g.dart';
diff --git a/lib/data/dao/player_match_dao.dart b/lib/data/dao/player_match_dao.dart
index 7de22a4..106f23f 100644
--- a/lib/data/dao/player_match_dao.dart
+++ b/lib/data/dao/player_match_dao.dart
@@ -1,8 +1,7 @@
import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/db/tables/player_match_table.dart';
-import 'package:game_tracker/data/db/tables/team_table.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/db/tables/player_match_table.dart';
+import 'package:tallee/data/dto/player.dart';
part 'player_match_dao.g.dart';
@@ -40,7 +39,7 @@ class PlayerMatchDao extends DatabaseAccessor
if (result.isEmpty) return null;
final futures = result.map(
- (row) => db.playerDao.getPlayerById(playerId: row.playerId),
+ (row) => db.playerDao.getPlayerById(playerId: row.playerId),
);
final players = await Future.wait(futures);
return players;
@@ -53,9 +52,9 @@ class PlayerMatchDao extends DatabaseAccessor
required String playerId,
}) async {
final result = await (select(playerMatchTable)
- ..where(
+ ..where(
(p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
- ))
+ ))
.getSingleOrNull();
return result?.score;
}
@@ -68,9 +67,9 @@ class PlayerMatchDao extends DatabaseAccessor
required int newScore,
}) async {
final rowsAffected = await (update(playerMatchTable)
- ..where(
+ ..where(
(p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
- ))
+ ))
.write(PlayerMatchTableCompanion(score: Value(newScore)));
return rowsAffected > 0;
}
@@ -83,9 +82,9 @@ class PlayerMatchDao extends DatabaseAccessor
required String? teamId,
}) async {
final rowsAffected = await (update(playerMatchTable)
- ..where(
+ ..where(
(p) => p.matchId.equals(matchId) & p.playerId.equals(playerId),
- ))
+ ))
.write(PlayerMatchTableCompanion(teamId: Value(teamId)));
return rowsAffected > 0;
}
@@ -94,11 +93,11 @@ class PlayerMatchDao extends DatabaseAccessor
/// Returns `true` if there are players, otherwise `false`.
Future matchHasPlayers({required String matchId}) async {
final count =
- await (selectOnly(playerMatchTable)
- ..where(playerMatchTable.matchId.equals(matchId))
- ..addColumns([playerMatchTable.playerId.count()]))
- .map((row) => row.read(playerMatchTable.playerId.count()))
- .getSingle();
+ await (selectOnly(playerMatchTable)
+ ..where(playerMatchTable.matchId.equals(matchId))
+ ..addColumns([playerMatchTable.playerId.count()]))
+ .map((row) => row.read(playerMatchTable.playerId.count()))
+ .getSingle();
return (count ?? 0) > 0;
}
@@ -109,12 +108,12 @@ class PlayerMatchDao extends DatabaseAccessor
required String playerId,
}) async {
final count =
- await (selectOnly(playerMatchTable)
- ..where(playerMatchTable.matchId.equals(matchId))
- ..where(playerMatchTable.playerId.equals(playerId))
- ..addColumns([playerMatchTable.playerId.count()]))
- .map((row) => row.read(playerMatchTable.playerId.count()))
- .getSingle();
+ await (selectOnly(playerMatchTable)
+ ..where(playerMatchTable.matchId.equals(matchId))
+ ..where(playerMatchTable.playerId.equals(playerId))
+ ..addColumns([playerMatchTable.playerId.count()]))
+ .map((row) => row.read(playerMatchTable.playerId.count()))
+ .getSingle();
return (count ?? 0) > 0;
}
@@ -153,9 +152,9 @@ class PlayerMatchDao extends DatabaseAccessor
if (playersToRemove.isNotEmpty) {
await (delete(playerMatchTable)..where(
(pg) =>
- pg.matchId.equals(matchId) &
- pg.playerId.isIn(playersToRemove.toList()),
- ))
+ pg.matchId.equals(matchId) &
+ pg.playerId.isIn(playersToRemove.toList()),
+ ))
.go();
}
@@ -164,15 +163,15 @@ class PlayerMatchDao extends DatabaseAccessor
final inserts = playersToAdd
.map(
(id) => PlayerMatchTableCompanion.insert(
- playerId: id,
- matchId: matchId,
- score: 0,
- ),
- )
+ playerId: id,
+ matchId: matchId,
+ score: 0,
+ ),
+ )
.toList();
await Future.wait(
inserts.map(
- (c) => into(
+ (c) => into(
playerMatchTable,
).insert(c, mode: InsertMode.insertOrIgnore),
),
@@ -187,15 +186,15 @@ class PlayerMatchDao extends DatabaseAccessor
required String teamId,
}) async {
final result = await (select(playerMatchTable)
- ..where(
+ ..where(
(p) => p.matchId.equals(matchId) & p.teamId.equals(teamId),
- ))
+ ))
.get();
if (result.isEmpty) return [];
final futures = result.map(
- (row) => db.playerDao.getPlayerById(playerId: row.playerId),
+ (row) => db.playerDao.getPlayerById(playerId: row.playerId),
);
return Future.wait(futures);
}
diff --git a/lib/data/db/database.dart b/lib/data/db/database.dart
index d3d447c..4c70b21 100644
--- a/lib/data/db/database.dart
+++ b/lib/data/db/database.dart
@@ -1,22 +1,18 @@
import 'package:drift/drift.dart';
import 'package:drift_flutter/drift_flutter.dart';
-import 'package:game_tracker/data/dao/game_dao.dart';
-import 'package:game_tracker/data/dao/group_dao.dart';
-import 'package:game_tracker/data/dao/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/dao/score_dao.dart';
-import 'package:game_tracker/data/dao/team_dao.dart';
-import 'package:game_tracker/data/db/tables/game_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:game_tracker/data/db/tables/score_table.dart';
-import 'package:game_tracker/data/db/tables/team_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';
@@ -24,22 +20,18 @@ part 'database.g.dart';
tables: [
PlayerTable,
GroupTable,
- GameTable,
- TeamTable,
MatchTable,
PlayerGroupTable,
PlayerMatchTable,
- ScoreTable,
+ GroupMatchTable,
],
daos: [
PlayerDao,
GroupDao,
- GameDao,
- TeamDao,
MatchDao,
PlayerGroupDao,
PlayerMatchDao,
- ScoreDao,
+ GroupMatchDao,
],
)
class AppDatabase extends _$AppDatabase {
diff --git a/lib/data/db/tables/player_group_table.dart b/lib/data/db/tables/player_group_table.dart
index da2521b..8d484ef 100644
--- a/lib/data/db/tables/player_group_table.dart
+++ b/lib/data/db/tables/player_group_table.dart
@@ -1,6 +1,6 @@
import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/tables/group_table.dart';
-import 'package:game_tracker/data/db/tables/player_table.dart';
+import 'package:tallee/data/db/tables/group_table.dart';
+import 'package:tallee/data/db/tables/player_table.dart';
class PlayerGroupTable extends Table {
TextColumn get playerId =>
diff --git a/lib/data/db/tables/player_match_table.dart b/lib/data/db/tables/player_match_table.dart
index 721e222..08eb16c 100644
--- a/lib/data/db/tables/player_match_table.dart
+++ b/lib/data/db/tables/player_match_table.dart
@@ -1,7 +1,6 @@
import 'package:drift/drift.dart';
-import 'package:game_tracker/data/db/tables/match_table.dart';
-import 'package:game_tracker/data/db/tables/player_table.dart';
-import 'package:game_tracker/data/db/tables/team_table.dart';
+import 'package:tallee/data/db/tables/match_table.dart';
+import 'package:tallee/data/db/tables/player_table.dart';
class PlayerMatchTable extends Table {
TextColumn get playerId =>
diff --git a/lib/data/dto/group.dart b/lib/data/dto/group.dart
index 00ee280..0738417 100644
--- a/lib/data/dto/group.dart
+++ b/lib/data/dto/group.dart
@@ -1,5 +1,5 @@
import 'package:clock/clock.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/dto/player.dart';
import 'package:uuid/uuid.dart';
class Group {
diff --git a/lib/data/dto/match.dart b/lib/data/dto/match.dart
index a9b81ba..81a3771 100644
--- a/lib/data/dto/match.dart
+++ b/lib/data/dto/match.dart
@@ -1,8 +1,6 @@
import 'package:clock/clock.dart';
-import 'package:game_tracker/core/enums.dart';
-import 'package:game_tracker/data/dto/game.dart';
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/dto/group.dart';
+import 'package:tallee/data/dto/player.dart';
import 'package:uuid/uuid.dart';
class Match {
@@ -25,7 +23,7 @@ class Match {
required this.notes,
this.winner,
}) : id = id ?? const Uuid().v4(),
- createdAt = createdAt ?? clock.now();
+ createdAt = createdAt ?? clock.now();
@override
String toString() {
@@ -35,13 +33,13 @@ class Match {
/// Creates a Match instance from a JSON object (ID references format).
/// Related objects are reconstructed from IDs by the DataTransferService.
Match.fromJson(Map json)
- : id = json['id'],
- createdAt = DateTime.parse(json['createdAt']),
- name = json['name'],
- game = Game(name: '', ruleset: Ruleset.singleWinner, description: '', color: '', icon: ''), // Populated during import via DataTransferService
- group = null, // Populated during import via DataTransferService
- players = [], // Populated during import via DataTransferService
- notes = json['notes'] ?? '';
+ : id = json['id'],
+ createdAt = DateTime.parse(json['createdAt']),
+ name = json['name'],
+ game = Game(name: '', ruleset: Ruleset.singleWinner, description: '', color: '', icon: ''), // Populated during import via DataTransferService
+ group = null, // Populated during import via DataTransferService
+ players = [], // Populated during import via DataTransferService
+ notes = json['notes'] ?? '';
/// Converts the Match instance to a JSON object using normalized format (ID references only).
Map toJson() => {
diff --git a/lib/l10n/arb/app_de.arb b/lib/l10n/arb/app_de.arb
index 9e981b0..e0efc2c 100644
--- a/lib/l10n/arb/app_de.arb
+++ b/lib/l10n/arb/app_de.arb
@@ -3,7 +3,7 @@
"all_players": "Alle Spieler:innen",
"all_players_selected": "Alle Spieler:innen ausgewählt",
"amount_of_matches": "Anzahl der Spiele",
- "app_name": "Game Tracker",
+ "app_name": "Tallee",
"best_player": "Beste:r Spieler:in",
"cancel": "Abbrechen",
"choose_game": "Spielvorlage wählen",
diff --git a/lib/l10n/arb/app_en.arb b/lib/l10n/arb/app_en.arb
index 27419c8..6a64a1b 100644
--- a/lib/l10n/arb/app_en.arb
+++ b/lib/l10n/arb/app_en.arb
@@ -301,7 +301,7 @@
"all_players": "All players",
"all_players_selected": "All players selected",
"amount_of_matches": "Amount of Matches",
- "app_name": "Game Tracker",
+ "app_name": "Tallee",
"best_player": "Best Player",
"cancel": "Cancel",
"choose_game": "Choose Game",
diff --git a/lib/l10n/generated/app_localizations.dart b/lib/l10n/generated/app_localizations.dart
index b0aabcb..87fab99 100644
--- a/lib/l10n/generated/app_localizations.dart
+++ b/lib/l10n/generated/app_localizations.dart
@@ -119,7 +119,7 @@ abstract class AppLocalizations {
/// The name of the App
///
/// In en, this message translates to:
- /// **'Game Tracker'**
+ /// **'Tallee'**
String get app_name;
/// Label for best player statistic
diff --git a/lib/l10n/generated/app_localizations_de.dart b/lib/l10n/generated/app_localizations_de.dart
index 0580d4f..54f3bc7 100644
--- a/lib/l10n/generated/app_localizations_de.dart
+++ b/lib/l10n/generated/app_localizations_de.dart
@@ -18,7 +18,7 @@ class AppLocalizationsDe extends AppLocalizations {
String get amount_of_matches => 'Anzahl der Spiele';
@override
- String get app_name => 'Game Tracker';
+ String get app_name => 'Tallee';
@override
String get best_player => 'Beste:r Spieler:in';
diff --git a/lib/l10n/generated/app_localizations_en.dart b/lib/l10n/generated/app_localizations_en.dart
index 8e2e453..440ac10 100644
--- a/lib/l10n/generated/app_localizations_en.dart
+++ b/lib/l10n/generated/app_localizations_en.dart
@@ -18,7 +18,7 @@ class AppLocalizationsEn extends AppLocalizations {
String get amount_of_matches => 'Amount of Matches';
@override
- String get app_name => 'Game Tracker';
+ String get app_name => 'Tallee';
@override
String get best_player => 'Best Player';
diff --git a/lib/main.dart b/lib/main.dart
index 2f64e2e..0002531 100644
--- a/lib/main.dart
+++ b/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(
diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart
index a110419..9e81a34 100644
--- a/lib/presentation/views/main_menu/custom_navigation_bar.dart
+++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart
@@ -1,15 +1,15 @@
import 'dart:ui';
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/adaptive_page_route.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/views/main_menu/group_view/groups_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/home_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/match_view/match_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/settings_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/statistics_view.dart';
-import 'package:game_tracker/presentation/widgets/navbar_item.dart';
+import 'package:tallee/core/adaptive_page_route.dart';
+import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:tallee/presentation/views/main_menu/group_view/groups_view.dart';
+import 'package:tallee/presentation/views/main_menu/home_view.dart';
+import 'package:tallee/presentation/views/main_menu/match_view/match_view.dart';
+import 'package:tallee/presentation/views/main_menu/settings_view/settings_view.dart';
+import 'package:tallee/presentation/views/main_menu/statistics_view.dart';
+import 'package:tallee/presentation/widgets/navbar_item.dart';
class CustomNavigationBar extends StatefulWidget {
/// A custom navigation bar widget that provides tabbed navigation
diff --git a/lib/presentation/views/main_menu/group_view/create_group_view.dart b/lib/presentation/views/main_menu/group_view/create_group_view.dart
index 0bda8b9..100023a 100644
--- a/lib/presentation/views/main_menu/group_view/create_group_view.dart
+++ b/lib/presentation/views/main_menu/group_view/create_group_view.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/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/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/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 {
/// A view that allows the user to create a new group
diff --git a/lib/presentation/views/main_menu/group_view/group_profile_view.dart b/lib/presentation/views/main_menu/group_view/group_profile_view.dart
index e366834..d4b71ab 100644
--- a/lib/presentation/views/main_menu/group_view/group_profile_view.dart
+++ b/lib/presentation/views/main_menu/group_view/group_profile_view.dart
@@ -1,19 +1,19 @@
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/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/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 GroupProfileView extends StatefulWidget {
/// A view that displays the profile of a group
@@ -78,7 +78,9 @@ class _GroupProfileViewState extends State {
onPressed: () => Navigator.of(context).pop(true),
child: Text(
loc.delete,
- style: TextStyle(color: CustomTheme.secondaryColor),
+ style: const TextStyle(
+ color: CustomTheme.secondaryColor,
+ ),
),
),
],
diff --git a/lib/presentation/views/main_menu/group_view/groups_view.dart b/lib/presentation/views/main_menu/group_view/groups_view.dart
index 24df3b8..dd47e12 100644
--- a/lib/presentation/views/main_menu/group_view/groups_view.dart
+++ b/lib/presentation/views/main_menu/group_view/groups_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/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_profile_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 GroupsView extends StatefulWidget {
/// A view that displays a list of groups
diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart
index 752cf75..6753ab6 100644
--- a/lib/presentation/views/main_menu/home_view.dart
+++ b/lib/presentation/views/main_menu/home_view.dart
@@ -1,20 +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/core/enums.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/dto/game.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,
@@ -207,7 +205,7 @@ class _HomeViewState extends State {
loadedRecentMatches = results[2] as List;
recentMatches =
(loadedRecentMatches
- ..sort((a, b) => b.createdAt.compareTo(a.createdAt)))
+ ..sort((a, b) => b.createdAt.compareTo(a.createdAt)))
.take(2)
.toList();
if (mounted) {
diff --git a/lib/presentation/views/main_menu/match_view/create_match/choose_game_view.dart b/lib/presentation/views/main_menu/match_view/create_match/choose_game_view.dart
index 3ff6e79..447b9c5 100644
--- a/lib/presentation/views/main_menu/match_view/create_match/choose_game_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/choose_game_view.dart
@@ -1,9 +1,9 @@
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/text_input/custom_search_bar.dart';
-import 'package:game_tracker/presentation/widgets/tiles/title_description_list_tile.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/widgets/text_input/custom_search_bar.dart';
+import 'package:tallee/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
diff --git a/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart b/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart
index 592d765..9c60b16 100644
--- a/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/choose_group_view.dart
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/widgets/text_input/custom_search_bar.dart';
-import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart';
-import 'package:game_tracker/presentation/widgets/top_centered_message.dart';
+import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/data/dto/group.dart';
+import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:tallee/presentation/widgets/text_input/custom_search_bar.dart';
+import 'package:tallee/presentation/widgets/tiles/group_tile.dart';
+import 'package:tallee/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.
diff --git a/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart b/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
index 30107b7..149371f 100644
--- a/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
+++ b/lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart
@@ -1,22 +1,21 @@
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/game.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
@@ -166,8 +165,8 @@ class _CreateMatchViewState extends State {
filteredPlayerList = playerList
.where(
(p) =>
- !selectedGroup!.members.any((m) => m.id == p.id),
- )
+ !selectedGroup!.members.any((m) => m.id == p.id),
+ )
.toList();
} else {
filteredPlayerList = List.from(playerList);
@@ -193,56 +192,56 @@ class _CreateMatchViewState extends State {
buttonType: ButtonType.primary,
onPressed: _enableCreateGameButton()
? () async {
- // Use a game from the games list
- Game? gameToUse;
- if (selectedGameIndex == -1) {
- // Use the first game as default if none selected
- final selectedGame = games[0];
- gameToUse = Game(
- name: selectedGame.$1,
- description: selectedGame.$2,
- ruleset: selectedGame.$3,
- color: '0xFF000000',
- icon: '',
- );
- } else {
- // Use the selected game from the list
- final selectedGame = games[selectedGameIndex];
- gameToUse = Game(
- name: selectedGame.$1,
- description: selectedGame.$2,
- ruleset: selectedGame.$3,
- color: '0xFF000000',
- icon: '',
- );
- }
- // Add the game to the database if it doesn't exist
- await db.gameDao.addGame(game: gameToUse);
+ // Use a game from the games list
+ Game? gameToUse;
+ if (selectedGameIndex == -1) {
+ // Use the first game as default if none selected
+ final selectedGame = games[0];
+ gameToUse = Game(
+ name: selectedGame.$1,
+ description: selectedGame.$2,
+ ruleset: selectedGame.$3,
+ color: '0xFF000000',
+ icon: '',
+ );
+ } else {
+ // Use the selected game from the list
+ final selectedGame = games[selectedGameIndex];
+ gameToUse = Game(
+ name: selectedGame.$1,
+ description: selectedGame.$2,
+ ruleset: selectedGame.$3,
+ color: '0xFF000000',
+ icon: '',
+ );
+ }
+ // Add the game to the database if it doesn't exist
+ await db.gameDao.addGame(game: gameToUse);
- Match match = Match(
- name: _matchNameController.text.isEmpty
- ? (hintText ?? '')
- : _matchNameController.text.trim(),
- createdAt: DateTime.now(),
- game: gameToUse,
- group: selectedGroup,
- players: selectedPlayers,
- notes: '',
- );
- await db.matchDao.addMatch(match: match);
- if (context.mounted) {
- Navigator.pushReplacement(
- context,
- adaptivePageRoute(
- fullscreenDialog: true,
- builder: (context) => MatchResultView(
- match: match,
- onWinnerChanged: widget.onWinnerChanged,
- ),
- ),
- );
- }
- }
+ Match match = Match(
+ name: _matchNameController.text.isEmpty
+ ? (hintText ?? '')
+ : _matchNameController.text.trim(),
+ createdAt: DateTime.now(),
+ game: gameToUse,
+ group: selectedGroup,
+ players: selectedPlayers,
+ notes: '',
+ );
+ await db.matchDao.addMatch(match: match);
+ if (context.mounted) {
+ Navigator.pushReplacement(
+ context,
+ adaptivePageRoute(
+ fullscreenDialog: true,
+ builder: (context) => MatchResultView(
+ match: match,
+ onWinnerChanged: widget.onWinnerChanged,
+ ),
+ ),
+ );
+ }
+ }
: null,
),
],
@@ -259,6 +258,6 @@ class _CreateMatchViewState extends State {
/// - 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));
}
-}
+}
\ No newline at end of file
diff --git a/lib/presentation/views/main_menu/match_view/match_result_view.dart b/lib/presentation/views/main_menu/match_view/match_result_view.dart
index 1deb385..75015f0 100644
--- a/lib/presentation/views/main_menu/match_view/match_result_view.dart
+++ b/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
diff --git a/lib/presentation/views/main_menu/match_view/match_view.dart b/lib/presentation/views/main_menu/match_view/match_view.dart
index b5488bc..c340c43 100644
--- a/lib/presentation/views/main_menu/match_view/match_view.dart
+++ b/lib/presentation/views/main_menu/match_view/match_view.dart
@@ -2,23 +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/core/enums.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/dto/game.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_result_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
diff --git a/lib/presentation/views/main_menu/settings_view/licenses/license_detail_view.dart b/lib/presentation/views/main_menu/settings_view/licenses/license_detail_view.dart
index 54ff34e..6e58108 100644
--- a/lib/presentation/views/main_menu/settings_view/licenses/license_detail_view.dart
+++ b/lib/presentation/views/main_menu/settings_view/licenses/license_detail_view.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
-import 'package:game_tracker/presentation/widgets/colored_icon_container.dart';
+import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:tallee/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
+import 'package:tallee/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: TextStyle(
+ style: const TextStyle(
fontSize: 12,
color: CustomTheme.secondaryColor,
decoration: TextDecoration.underline,
diff --git a/lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart b/lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
index ef1109c..b84eacc 100644
--- a/lib/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart
+++ b/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 = _game_tracker;
+const thisPackage = _tallee;
/// All dependencies including transitive dependencies.
const allDependencies = [
@@ -31,6 +31,7 @@ const allDependencies = [
_cli_config,
_cli_util,
_clock,
+ _code_assets,
_code_builder,
_collection,
_convert,
@@ -57,10 +58,12 @@ const allDependencies = [
_flutter_lints,
_flutter_plugin_android_lifecycle,
_flutter_web_plugins,
+ _fluttericon,
_font_awesome_flutter,
_frontend_server_client,
_glob,
_graphs,
+ _hooks,
_html,
_http,
_http_multi_server,
@@ -80,8 +83,10 @@ const allDependencies = [
_material_color_utilities,
_meta,
_mime,
+ _native_toolchain_c,
_nested,
_node_preamble,
+ _objective_c,
_package_config,
_package_info_plus,
_package_info_plus_platform_interface,
@@ -160,6 +165,7 @@ const dependencies = [
_drift_flutter,
_file_picker,
_file_saver,
+ _fluttericon,
_font_awesome_flutter,
_intl,
_json_schema,
@@ -517,13 +523,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.0
+/// build_daemon 4.1.1
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.0',
+ version: '4.1.1',
spdxIdentifiers: ['BSD-3-Clause'],
isMarkdown: false,
isSdk: false,
@@ -724,14 +730,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.0
+/// built_value 8.12.3
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.0',
+ version: '8.12.3',
spdxIdentifiers: ['BSD-3-Clause'],
isMarkdown: false,
isSdk: false,
@@ -1185,13 +1191,54 @@ const _clock = Package(
limitations under the License.''',
);
-/// code_builder 4.11.0
+/// code_assets 1.0.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.0',
+ version: '4.11.1',
spdxIdentifiers: ['BSD-3-Clause'],
isMarkdown: false,
isSdk: false,
@@ -2369,13 +2416,13 @@ const _fake_async = Package(
limitations under the License.''',
);
-/// ffi 2.1.4
+/// ffi 2.1.5
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.4',
+ version: '2.1.5',
spdxIdentifiers: ['BSD-3-Clause'],
isMarkdown: false,
isSdk: false,
@@ -2450,14 +2497,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.7
+/// file_picker 10.3.8
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.7',
+ version: '10.3.8',
spdxIdentifiers: ['MIT'],
isMarkdown: false,
isSdk: false,
@@ -2571,13 +2618,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.4
+/// flutter 3.38.6
const _flutter = Package(
name: 'flutter',
description: 'A framework for writing Flutter applications',
homepage: 'https://flutter.dev',
authors: [],
- version: '3.38.4',
+ version: '3.38.6',
spdxIdentifiers: ['BSD-3-Clause'],
isMarkdown: false,
isSdk: true,
@@ -2701,6 +2748,44 @@ 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',
@@ -2862,6 +2947,47 @@ 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.0
+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.0',
+ 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',
@@ -3821,6 +3947,47 @@ 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',
@@ -3918,6 +4085,47 @@ 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.2.4
+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.2.4',
+ 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',
@@ -4164,13 +4372,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.20
+/// path_provider_android 2.2.22
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.20',
+ version: '2.2.22',
spdxIdentifiers: ['BSD-3-Clause'],
isMarkdown: false,
isSdk: false,
@@ -4203,18 +4411,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.4.3
+/// path_provider_foundation 2.6.0
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.4.3',
+ version: '2.6.0',
spdxIdentifiers: ['BSD-3-Clause'],
isMarkdown: false,
isSdk: false,
- dependencies: [PackageRef('flutter'), PackageRef('path_provider_platform_interface')],
- devDependencies: [PackageRef('build_runner'), PackageRef('path')],
+ dependencies: [PackageRef('ffi'), PackageRef('flutter'), PackageRef('objective_c'), PackageRef('path_provider_platform_interface')],
+ devDependencies: [],
license: '''Copyright 2013 The Flutter Authors
Redistribution and use in source and binary forms, with or without modification,
@@ -5503,18 +5711,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.1
+/// skeletonizer 2.1.2
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.1',
+ version: '2.1.2',
spdxIdentifiers: ['MIT'],
isMarkdown: false,
isSdk: false,
dependencies: [PackageRef('flutter')],
- devDependencies: [PackageRef('flutter_lints')],
+ devDependencies: [PackageRef('flutter_lints'), PackageRef('coverage')],
license: '''MIT License
Copyright (c) 2023 Milad Akarie
@@ -5737,13 +5945,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.''',
);
-/// sqlite3_flutter_libs 0.5.40
+/// sqlite3_flutter_libs 0.5.41
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/main/sqlite3_flutter_libs',
+ homepage: 'https://github.com/simolus3/sqlite3.dart/tree/v2/sqlite3_flutter_libs',
authors: [],
- version: '0.5.40',
+ version: '0.5.41',
spdxIdentifiers: ['MIT'],
isMarkdown: false,
isSdk: false,
@@ -5772,14 +5980,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.''',
);
-/// sqlparser 0.42.0
+/// sqlparser 0.42.1
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.0',
+ version: '0.42.1',
spdxIdentifiers: ['MIT'],
isMarkdown: false,
isSdk: false,
@@ -6525,13 +6733,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.1
+/// url_launcher_web 2.4.2
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.1',
+ version: '2.4.2',
spdxIdentifiers: ['Apache-2.0', 'BSD-3-Clause'],
isMarkdown: false,
isSdk: false,
@@ -6539,7 +6747,7 @@ const _url_launcher_web = Package(
devDependencies: [],
license: '''url_launcher_web
-Copyright 2013 The Flutter Authors. All rights reserved.
+Copyright 2013 The Flutter Authors
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
@@ -6932,18 +7140,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.1.4
+/// watcher 1.2.1
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.1.4',
+ version: '1.2.1',
spdxIdentifiers: ['BSD-3-Clause'],
isMarkdown: false,
isSdk: false,
dependencies: [PackageRef('async'), PackageRef('path')],
- devDependencies: [PackageRef('test')],
+ devDependencies: [PackageRef('clock'), PackageRef('fake_async'), PackageRef('test')],
license: '''Copyright 2014, the Dart project authors.
Redistribution and use in source and binary forms, with or without
@@ -7151,7 +7359,7 @@ const _win32 = Package(
isMarkdown: false,
isSdk: false,
dependencies: [PackageRef('ffi')],
- devDependencies: [PackageRef('args'), PackageRef('path'), PackageRef('test')],
+ devDependencies: [PackageRef('args'), PackageRef('hooks'), PackageRef('path'), PackageRef('test')],
license: '''BSD 3-Clause License
Copyright (c) 2024, Halil Durmus
@@ -7291,16 +7499,181 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.''',
);
-/// game_tracker 0.0.5+127
-const _game_tracker = Package(
- name: 'game_tracker',
- description: 'Game Tracking App for Card Games',
+/// tallee 0.0.13+247
+const _tallee = Package(
+ name: 'tallee',
+ description: 'Tracking App for Card Games',
authors: [],
- version: '0.0.5+127',
- spdxIdentifiers: [],
+ version: '0.0.13+247',
+ spdxIdentifiers: ['LGPL-3.0'],
isMarkdown: false,
isSdk: false,
- 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')],
+ 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')],
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.
+ 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.''',
);
diff --git a/lib/presentation/views/main_menu/settings_view/licenses_view.dart b/lib/presentation/views/main_menu/settings_view/licenses_view.dart
index 58aae5b..ed98c26 100644
--- a/lib/presentation/views/main_menu/settings_view/licenses_view.dart
+++ b/lib/presentation/views/main_menu/settings_view/licenses_view.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
-import 'package:game_tracker/presentation/widgets/tiles/license_tile.dart';
+import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:tallee/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
+import 'package:tallee/presentation/widgets/tiles/license_tile.dart';
class LicensesView extends StatelessWidget {
/// A view that displays a list of open source licenses used in the app
diff --git a/lib/presentation/views/main_menu/settings_view/settings_view.dart b/lib/presentation/views/main_menu/settings_view/settings_view.dart
index 7941cb5..d063e7c 100644
--- a/lib/presentation/views/main_menu/settings_view/settings_view.dart
+++ b/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 {
@@ -88,7 +88,7 @@ class _SettingsViewState extends State {
);
final result = await DataTransferService.exportData(
json,
- 'game_tracker-data',
+ 'tallee-data',
);
if (!scaffoldMessengerContext.mounted) return;
showExportSnackBar(
@@ -136,7 +136,7 @@ class _SettingsViewState extends State {
onPressed: () => Navigator.of(context).pop(true),
child: Text(
loc.delete,
- style: TextStyle(
+ style: const TextStyle(
color: CustomTheme.secondaryColor,
),
),
diff --git a/lib/presentation/views/main_menu/statistics_view.dart b/lib/presentation/views/main_menu/statistics_view.dart
index 908b10a..af3eba6 100644
--- a/lib/presentation/views/main_menu/statistics_view.dart
+++ b/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
diff --git a/lib/presentation/widgets/buttons/animated_dialog_button.dart b/lib/presentation/widgets/buttons/animated_dialog_button.dart
index 65c0510..798edfa 100644
--- a/lib/presentation/widgets/buttons/animated_dialog_button.dart
+++ b/lib/presentation/widgets/buttons/animated_dialog_button.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class AnimatedDialogButton extends StatefulWidget {
/// A custom animated button widget that provides a scaling and opacity effect
diff --git a/lib/presentation/widgets/buttons/custom_width_button.dart b/lib/presentation/widgets/buttons/custom_width_button.dart
index 8d45540..489ceae 100644
--- a/lib/presentation/widgets/buttons/custom_width_button.dart
+++ b/lib/presentation/widgets/buttons/custom_width_button.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/core/enums.dart';
+import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/core/enums.dart';
class CustomWidthButton extends StatelessWidget {
/// A custom button widget that is designed to have a width relative to the screen size.
diff --git a/lib/presentation/widgets/buttons/quick_create_button.dart b/lib/presentation/widgets/buttons/quick_create_button.dart
index e013186..f3aa588 100644
--- a/lib/presentation/widgets/buttons/quick_create_button.dart
+++ b/lib/presentation/widgets/buttons/quick_create_button.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class QuickCreateButton extends StatefulWidget {
/// A button widget designed for quick creating matches in the [HomeView]
@@ -28,14 +28,18 @@ class _QuickCreateButtonState extends State {
onPressed: widget.onPressed,
style: ElevatedButton.styleFrom(
minimumSize: const Size(140, 45),
- backgroundColor: CustomTheme.primaryColor,
+ backgroundColor: CustomTheme.primaryColor.withAlpha(200).withBlue(40),
shape: RoundedRectangleBorder(
borderRadius: CustomTheme.standardBorderRadiusAll,
),
),
child: Text(
widget.text,
- style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
+ style: const TextStyle(
+ color: CustomTheme.textColor,
+ fontWeight: FontWeight.bold,
+ fontSize: 16,
+ ),
),
);
}
diff --git a/lib/presentation/widgets/colored_icon_container.dart b/lib/presentation/widgets/colored_icon_container.dart
index be51cd2..fe0659f 100644
--- a/lib/presentation/widgets/colored_icon_container.dart
+++ b/lib/presentation/widgets/colored_icon_container.dart
@@ -1,5 +1,5 @@
import 'package:flutter/cupertino.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/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.withGreen(40),
+ color: CustomTheme.primaryColor.withBlue(40),
),
),
],
diff --git a/lib/presentation/widgets/custom_alert_dialog.dart b/lib/presentation/widgets/custom_alert_dialog.dart
index af5b45a..84843b7 100644
--- a/lib/presentation/widgets/custom_alert_dialog.dart
+++ b/lib/presentation/widgets/custom_alert_dialog.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/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: BorderSide(color: CustomTheme.boxBorder),
+ side: const BorderSide(color: CustomTheme.boxBorder),
),
);
}
diff --git a/lib/presentation/widgets/navbar_item.dart b/lib/presentation/widgets/navbar_item.dart
index 45f2976..0b08371 100644
--- a/lib/presentation/widgets/navbar_item.dart
+++ b/lib/presentation/widgets/navbar_item.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class NavbarItem extends StatefulWidget {
/// A navigation bar item widget that represents a single tab in a navigation bar.
diff --git a/lib/presentation/widgets/player_selection.dart b/lib/presentation/widgets/player_selection.dart
index 68aaa7d..6e16c61 100644
--- a/lib/presentation/widgets/player_selection.dart
+++ b/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,
diff --git a/lib/presentation/widgets/text_input/custom_search_bar.dart b/lib/presentation/widgets/text_input/custom_search_bar.dart
index eefe6d7..aeb71f2 100644
--- a/lib/presentation/widgets/text_input/custom_search_bar.dart
+++ b/lib/presentation/widgets/text_input/custom_search_bar.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class CustomSearchBar extends StatelessWidget {
/// A custom search bar widget that encapsulates a [SearchBar] with additional customization options.
@@ -87,7 +87,9 @@ class CustomSearchBar extends StatelessWidget {
const SizedBox(width: 5),
],
backgroundColor: WidgetStateProperty.all(CustomTheme.boxColor),
- side: WidgetStateProperty.all(BorderSide(color: CustomTheme.boxBorder)),
+ side: WidgetStateProperty.all(
+ const BorderSide(color: CustomTheme.boxBorder),
+ ),
shape: WidgetStateProperty.all(
RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
),
diff --git a/lib/presentation/widgets/text_input/text_input_field.dart b/lib/presentation/widgets/text_input/text_input_field.dart
index 9d8680a..16f5072 100644
--- a/lib/presentation/widgets/text_input/text_input_field.dart
+++ b/lib/presentation/widgets/text_input/text_input_field.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class TextInputField extends StatelessWidget {
/// A custom text input field widget that encapsulates a [TextField] with specific styling.
@@ -42,12 +42,12 @@ class TextInputField extends StatelessWidget {
hintStyle: const TextStyle(fontSize: 18),
// Hides the character counter
counterText: '',
- enabledBorder: OutlineInputBorder(
- borderRadius: const BorderRadius.all(Radius.circular(12)),
+ enabledBorder: const OutlineInputBorder(
+ borderRadius: BorderRadius.all(Radius.circular(12)),
borderSide: BorderSide(color: CustomTheme.boxBorder),
),
- focusedBorder: OutlineInputBorder(
- borderRadius: const BorderRadius.all(Radius.circular(12)),
+ focusedBorder: const OutlineInputBorder(
+ borderRadius: BorderRadius.all(Radius.circular(12)),
borderSide: BorderSide(color: CustomTheme.boxBorder),
),
floatingLabelBehavior: FloatingLabelBehavior.never,
diff --git a/lib/presentation/widgets/tiles/choose_tile.dart b/lib/presentation/widgets/tiles/choose_tile.dart
index 595816e..10ded6b 100644
--- a/lib/presentation/widgets/tiles/choose_tile.dart
+++ b/lib/presentation/widgets/tiles/choose_tile.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class ChooseTile extends StatefulWidget {
/// A tile widget that allows users to choose an option by tapping on it.
diff --git a/lib/presentation/widgets/tiles/custom_radio_list_tile.dart b/lib/presentation/widgets/tiles/custom_radio_list_tile.dart
index 2d8dc7a..2b8e855 100644
--- a/lib/presentation/widgets/tiles/custom_radio_list_tile.dart
+++ b/lib/presentation/widgets/tiles/custom_radio_list_tile.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class CustomRadioListTile extends StatelessWidget {
/// A custom radio list tile widget that encapsulates a [Radio] button with additional styling and functionality.
diff --git a/lib/presentation/widgets/tiles/group_tile.dart b/lib/presentation/widgets/tiles/group_tile.dart
index c035a04..d662918 100644
--- a/lib/presentation/widgets/tiles/group_tile.dart
+++ b/lib/presentation/widgets/tiles/group_tile.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/data/dto/group.dart';
-import 'package:game_tracker/presentation/widgets/tiles/text_icon_tile.dart';
+import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/data/dto/group.dart';
+import 'package:tallee/presentation/widgets/tiles/text_icon_tile.dart';
class GroupTile extends StatefulWidget {
/// A tile widget that displays information about a group, including its name and members.
diff --git a/lib/presentation/widgets/tiles/info_tile.dart b/lib/presentation/widgets/tiles/info_tile.dart
index 78d7f28..fdbd88c 100644
--- a/lib/presentation/widgets/tiles/info_tile.dart
+++ b/lib/presentation/widgets/tiles/info_tile.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class InfoTile extends StatefulWidget {
/// A tile widget that displays a title with an icon and some content below it.
diff --git a/lib/presentation/widgets/tiles/license_tile.dart b/lib/presentation/widgets/tiles/license_tile.dart
index 33e5a45..9289ed5 100644
--- a/lib/presentation/widgets/tiles/license_tile.dart
+++ b/lib/presentation/widgets/tiles/license_tile.dart
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses/license_detail_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
-import 'package:game_tracker/presentation/widgets/colored_icon_container.dart';
+import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/presentation/views/main_menu/settings_view/licenses/license_detail_view.dart';
+import 'package:tallee/presentation/views/main_menu/settings_view/licenses/oss_licenses.dart';
+import 'package:tallee/presentation/widgets/colored_icon_container.dart';
class LicenseTile extends StatelessWidget {
/// A tile widget that displays information about a software package license.
diff --git a/lib/presentation/widgets/tiles/match_tile.dart b/lib/presentation/widgets/tiles/match_tile.dart
index e1365c1..ab65e5d 100644
--- a/lib/presentation/widgets/tiles/match_tile.dart
+++ b/lib/presentation/widgets/tiles/match_tile.dart
@@ -1,10 +1,10 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.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/text_icon_tile.dart';
import 'package:intl/intl.dart';
+import 'package:tallee/core/custom_theme.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/text_icon_tile.dart';
class MatchTile extends StatefulWidget {
/// A tile widget that displays information about a match, including its name,
diff --git a/lib/presentation/widgets/tiles/quick_info_tile.dart b/lib/presentation/widgets/tiles/quick_info_tile.dart
index 4d6ef2e..5646fa5 100644
--- a/lib/presentation/widgets/tiles/quick_info_tile.dart
+++ b/lib/presentation/widgets/tiles/quick_info_tile.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class QuickInfoTile extends StatefulWidget {
/// A tile widget that displays a title with an icon and a numeric value below it.
diff --git a/lib/presentation/widgets/tiles/settings_list_tile.dart b/lib/presentation/widgets/tiles/settings_list_tile.dart
index d4bc6dc..de805cd 100644
--- a/lib/presentation/widgets/tiles/settings_list_tile.dart
+++ b/lib/presentation/widgets/tiles/settings_list_tile.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
-import 'package:game_tracker/presentation/widgets/colored_icon_container.dart';
+import 'package:tallee/core/custom_theme.dart';
+import 'package:tallee/presentation/widgets/colored_icon_container.dart';
class SettingsListTile extends StatelessWidget {
/// A customizable settings list tile widget that displays an icon, title, and an optional suffix widget.
diff --git a/lib/presentation/widgets/tiles/statistics_tile.dart b/lib/presentation/widgets/tiles/statistics_tile.dart
index 2ac0dfd..bc2f7b6 100644
--- a/lib/presentation/widgets/tiles/statistics_tile.dart
+++ b/lib/presentation/widgets/tiles/statistics_tile.dart
@@ -1,8 +1,8 @@
import 'dart:math';
import 'package:flutter/material.dart';
-import 'package:game_tracker/l10n/generated/app_localizations.dart';
-import 'package:game_tracker/presentation/widgets/tiles/info_tile.dart';
+import 'package:tallee/l10n/generated/app_localizations.dart';
+import 'package:tallee/presentation/widgets/tiles/info_tile.dart';
class StatisticsTile extends StatelessWidget {
/// A tile widget that displays statistical data using horizontal bars.
diff --git a/lib/presentation/widgets/tiles/text_icon_list_tile.dart b/lib/presentation/widgets/tiles/text_icon_list_tile.dart
index e468e95..2b29d41 100644
--- a/lib/presentation/widgets/tiles/text_icon_list_tile.dart
+++ b/lib/presentation/widgets/tiles/text_icon_list_tile.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class TextIconListTile extends StatelessWidget {
/// A list tile widget that displays text with an optional icon button.
diff --git a/lib/presentation/widgets/tiles/text_icon_tile.dart b/lib/presentation/widgets/tiles/text_icon_tile.dart
index 90c32b7..f98e0a7 100644
--- a/lib/presentation/widgets/tiles/text_icon_tile.dart
+++ b/lib/presentation/widgets/tiles/text_icon_tile.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class TextIconTile extends StatelessWidget {
/// A tile widget that displays text with an optional icon that can be tapped.
diff --git a/lib/presentation/widgets/tiles/title_description_list_tile.dart b/lib/presentation/widgets/tiles/title_description_list_tile.dart
index a963d16..9dc8f33 100644
--- a/lib/presentation/widgets/tiles/title_description_list_tile.dart
+++ b/lib/presentation/widgets/tiles/title_description_list_tile.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:game_tracker/core/custom_theme.dart';
+import 'package:tallee/core/custom_theme.dart';
class TitleDescriptionListTile extends StatelessWidget {
/// A list tile widget that displays a title and description, with optional highlighting and badge.
diff --git a/lib/services/data_transfer_service.dart b/lib/services/data_transfer_service.dart
index 4bd8635..d002cdd 100644
--- a/lib/services/data_transfer_service.dart
+++ b/lib/services/data_transfer_service.dart
@@ -4,15 +4,13 @@ import 'dart:io';
import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:game_tracker/core/enums.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/dto/game.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/data/dto/team.dart';
import 'package:json_schema/json_schema.dart';
import 'package:provider/provider.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';
class DataTransferService {
/// Deletes all data from the database.
@@ -41,31 +39,31 @@ class DataTransferService {
'games': games.map((g) => g.toJson()).toList(),
'groups': groups
.map((g) => {
- 'id': g.id,
- 'name': g.name,
- 'description': g.description,
- 'createdAt': g.createdAt.toIso8601String(),
- 'memberIds': (g.members).map((m) => m.id).toList(),
- })
+ 'id': g.id,
+ 'name': g.name,
+ 'description': g.description,
+ 'createdAt': g.createdAt.toIso8601String(),
+ 'memberIds': (g.members).map((m) => m.id).toList(),
+ })
.toList(),
'teams': teams
.map((t) => {
- 'id': t.id,
- 'name': t.name,
- 'createdAt': t.createdAt.toIso8601String(),
- 'memberIds': (t.members).map((m) => m.id).toList(),
- })
+ 'id': t.id,
+ 'name': t.name,
+ 'createdAt': t.createdAt.toIso8601String(),
+ 'memberIds': (t.members).map((m) => m.id).toList(),
+ })
.toList(),
'matches': matches
.map((m) => {
- 'id': m.id,
- 'name': m.name,
- 'createdAt': m.createdAt.toIso8601String(),
- 'gameId': m.game.id,
- 'groupId': m.group?.id,
- 'playerIds': (m.players ?? []).map((p) => p.id).toList(),
- 'notes': m.notes,
- })
+ 'id': m.id,
+ 'name': m.name,
+ 'createdAt': m.createdAt.toIso8601String(),
+ 'gameId': m.game.id,
+ 'groupId': m.group?.id,
+ 'playerIds': (m.players ?? []).map((p) => p.id).toList(),
+ 'notes': m.notes,
+ })
.toList(),
};
@@ -78,9 +76,9 @@ class DataTransferService {
/// [jsonString] The JSON string to be exported.
/// [fileName] The desired name for the exported file (without extension).
static Future exportData(
- String jsonString,
- String fileName
- ) async {
+ String jsonString,
+ String fileName
+ ) async {
try {
final bytes = Uint8List.fromList(utf8.encode(jsonString));
final path = await FilePicker.platform.saveFile(
diff --git a/pubspec.yaml b/pubspec.yaml
index c22d107..6c22769 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
-name: game_tracker
-description: "Game Tracking App for Card Games"
+name: tallee
+description: "Tracking App for Card Games"
publish_to: 'none'
-version: 0.0.11+239
+version: 0.0.14+248
environment:
sdk: ^3.8.1
diff --git a/test/db_tests/game_test.dart b/test/db_tests/game_test.dart
index e38b85c..f7da1cf 100644
--- a/test/db_tests/game_test.dart
+++ b/test/db_tests/game_test.dart
@@ -1,10 +1,11 @@
import 'package:clock/clock.dart';
-import 'package:drift/drift.dart' hide isNull;
+import 'package:drift/drift.dart';
import 'package:drift/native.dart';
import 'package:flutter_test/flutter_test.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/dto/game.dart';
-import 'package:game_tracker/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';
void main() {
late AppDatabase database;
@@ -106,7 +107,7 @@ void main() {
// Verifies that getGameById throws a StateError when the game doesn't exist.
test('getGameById throws exception for non-existent game', () async {
expect(
- () => database.gameDao.getGameById(gameId: 'non-existent-id'),
+ () => database.gameDao.getGameById(gameId: 'non-existent-id'),
throwsA(isA()),
);
});
@@ -540,4 +541,3 @@ void main() {
});
});
}
-
diff --git a/test/db_tests/group_test.dart b/test/db_tests/group_test.dart
index 09b7466..a671232 100644
--- a/test/db_tests/group_test.dart
+++ b/test/db_tests/group_test.dart
@@ -2,9 +2,9 @@ import 'package:clock/clock.dart';
import 'package:drift/drift.dart' hide isNull;
import 'package:drift/native.dart';
import 'package:flutter_test/flutter_test.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:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/group.dart';
+import 'package:tallee/data/dto/player.dart';
void main() {
late AppDatabase database;
diff --git a/test/db_tests/player_group_test.dart b/test/db_tests/player_group_test.dart
index fa270bb..7e97871 100644
--- a/test/db_tests/player_group_test.dart
+++ b/test/db_tests/player_group_test.dart
@@ -2,9 +2,9 @@ import 'package:clock/clock.dart';
import 'package:drift/drift.dart';
import 'package:drift/native.dart';
import 'package:flutter_test/flutter_test.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:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/group.dart';
+import 'package:tallee/data/dto/player.dart';
void main() {
late AppDatabase database;
diff --git a/test/db_tests/player_match_test.dart b/test/db_tests/player_match_test.dart
index b8d3313..43d7e3d 100644
--- a/test/db_tests/player_match_test.dart
+++ b/test/db_tests/player_match_test.dart
@@ -1,14 +1,11 @@
import 'package:clock/clock.dart';
-import 'package:drift/drift.dart' hide isNotNull, isNull;
+import 'package:drift/drift.dart' hide isNotNull;
import 'package:drift/native.dart';
import 'package:flutter_test/flutter_test.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/dto/game.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/data/dto/team.dart';
-import 'package:game_tracker/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';
void main() {
late AppDatabase database;
@@ -154,7 +151,7 @@ void main() {
expect(result.players!.length, testMatchOnlyPlayers.players!.length - 1);
final playerExists = result.players!.any(
- (p) => p.id == playerToRemove.id,
+ (p) => p.id == playerToRemove.id,
);
expect(playerExists, false);
});
@@ -227,7 +224,7 @@ void main() {
// Verifies that the same player can be added to multiple different matches.
test(
'Adding the same player to separate matches works correctly',
- () async {
+ () async {
final playersList = [testPlayer1, testPlayer2, testPlayer3];
final match1 = Match(name: 'Match 1', game: testGame, players: playersList, notes: '');
final match2 = Match(name: 'Match 2', game: testGame, players: playersList, notes: '');
diff --git a/test/db_tests/player_test.dart b/test/db_tests/player_test.dart
index 8ce0e66..9d7fa77 100644
--- a/test/db_tests/player_test.dart
+++ b/test/db_tests/player_test.dart
@@ -2,8 +2,8 @@ import 'package:clock/clock.dart';
import 'package:drift/drift.dart' hide isNull;
import 'package:drift/native.dart';
import 'package:flutter_test/flutter_test.dart';
-import 'package:game_tracker/data/db/database.dart';
-import 'package:game_tracker/data/dto/player.dart';
+import 'package:tallee/data/db/database.dart';
+import 'package:tallee/data/dto/player.dart';
void main() {
late AppDatabase database;