Merge branch 'development' into feature/168-teamspiele-implementieren

# Conflicts:
#	lib/l10n/arb/app_de.arb
#	lib/l10n/arb/app_en.arb
#	lib/l10n/generated/app_localizations.dart
#	lib/l10n/generated/app_localizations_de.dart
#	lib/l10n/generated/app_localizations_en.dart
#	pubspec.yaml

.gitea/pull_request_template.yaml

@@ -34,6 +34,23 @@ body:
         - Modul X für bessere Leistung refactored
         - Dependencies aktualisiert
 
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: PR-Checkliste
+      description: Stelle sicher, dass alle Punkte erfüllt sind, bevor du den Pull Request zum Review freigibst.
+      options:
+        - label: Ich habe für Navigationen den AdaptiveNavigator` verwendet
+          required: false
+        - label: Ich habe alle Strings lokalisiert (de/en)
+          required: false
+        - label: Ich habe die Testdaten aktualisiert oder erweitert
+          required: false
+        - label: Ich habe das JSON-Schema angepasst
+          required: false
+        - label: Ich habe Tests für neue Datenbank/DAO-Funktionen hinzugefügt
+          required: false
+
   - type: textarea
     id: additional_notes
     attributes:

.gitea/workflows/pull_request.yaml

@@ -55,3 +55,45 @@ jobs:
 
       - name: Run tests
         run: flutter test
+
+  localizations:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Required for Flutter action
+      - name: Install jq
+        run: |
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.41.0
+
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.41.0-x64
+          flutter pub get
+
+      - name: Check for untranslated messages
+        run: |
+          flutter gen-l10n --no-use-deferred-loading
+
+          UNTRANSLATED_FILE=lib/l10n/untranslated_messages.json
+          if [ ! -f "$UNTRANSLATED_FILE" ]; then
+            echo "Expected $UNTRANSLATED_FILE to be generated, but it does not exist."
+            exit 1
+          fi
+
+          CONTENT=$(tr -d '[:space:]' < "$UNTRANSLATED_FILE")
+          if [ "$CONTENT" != "{}" ]; then
+            echo "Found untranslated messages:"
+            cat "$UNTRANSLATED_FILE"
+            exit 1
+          fi
+
+          echo "All messages translated."

.gitea/workflows/push.yaml

@@ -7,7 +7,286 @@ on:
       - "main"
 
 jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Required for Flutter action
+      - name: Install jq
+        run: |
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.41.0
+
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.41.0-x64
+          flutter pub get
+
+      - name: Run tests
+        run: flutter test
+
+  update_version:
+    runs-on: ubuntu-latest
+    if: gitea.ref == 'refs/heads/development'
+    env:
+      GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+      BRANCH_NAME: ${{ gitea.ref_name }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.BOT_TOKEN }}
+          ref: ${{ gitea.ref_name }}
+
+      - name: Increment version number
+        uses: stikkyapp/update-pubspec-version@v2
+        with:
+          strategy: 'patch'
+          path: './pubspec.yaml'
+
+      - name: Commit version update
+        env:
+          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+        run: |
+          git config --global user.name "Gitea Actions [bot]"
+          git config --global user.email "actions@yannick-weigert.de"
+          git config pull.rebase false
+          git pull origin "$BRANCH_NAME"
+          git add pubspec.yaml
+          git commit -m "Updated version number [skip ci]"
+          git push origin HEAD:$BRANCH_NAME
+
+  generate_licenses:
+    runs-on: ubuntu-latest
+    env:
+      GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+      BRANCH_NAME: ${{ gitea.ref_name }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.BOT_TOKEN }}
+          ref: ${{ gitea.ref_name }}
+
+      # Required for Flutter action
+      - name: Install jq
+        run: |
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.41.0
+
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.41.0-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
+        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 "$BRANCH_NAME"
+            git add lib test
+            git commit -m "Updated licenses [skip ci]"
+            git push origin HEAD:$BRANCH_NAME
+          else
+            echo "No changes to commit"
+          fi
+
+  generate_localizations:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Required for Flutter action
+      - name: Install jq
+        run: |
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.41.0
+
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.41.0-x64
+          flutter pub get
+
+      - name: Generate localizations
+        run: flutter gen-l10n --no-use-deferred-loading
+
+      - name: Check for changes
+        id: check_changes
+        run: |
+          if [ -n "$(git status --porcelain lib/l10n)" ]; then
+            echo "has_changes=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Commit generated localizations
+        if: steps.check_changes.outputs.has_changes == 'true'
+        env:
+          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+          BRANCH_NAME: ${{ gitea.ref_name }}
+        run: |
+          git fetch origin "$BRANCH_NAME"
+          git checkout "$BRANCH_NAME"
+
+          if [ -n "$(git status --porcelain lib test)" ]; then
+            git config --global user.name "Gitea Actions [bot]"
+            git config --global user.email "actions@yannick-weigert.de"
+            git config pull.rebase false
+            git pull origin "$BRANCH_NAME"
+            git add lib/l10n
+            git commit -m "Generated localizations [skip ci]"
+            git push origin "HEAD:$BRANCH_NAME"
+          else
+            echo "No changes to commit"
+          fi
+
+  sort_arb_files:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Required for Flutter action
+      - name: Install jq
+        run: |
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.41.0
+
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.41.0-x64
+          flutter pub get
+
+      - name: Sort .arb-Files
+        run: |
+          shopt -s nullglob
+          for file in lib/l10n/arb/app_*.arb; do
+            echo "Sorting $file"
+            dart run arb_utils sort "$file"
+          done
+
+      - name: Check for changes
+        id: check_changes
+        run: |
+          if [ -n "$(git status --porcelain lib/l10n/arb)" ]; then
+            echo "has_changes=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Commit sorted .arb-Files
+        if: steps.check_changes.outputs.has_changes == 'true'
+        env:
+          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+          BRANCH_NAME: ${{ gitea.ref_name }}
+        run: |
+          git fetch origin "$BRANCH_NAME"
+          git checkout "$BRANCH_NAME"
+
+          if [ -n "$(git status --porcelain lib/l10n/arb)" ]; then
+            git config --global user.name "Gitea Actions [bot]"
+            git config --global user.email "actions@yannick-weigert.de"
+            git config pull.rebase false
+            git pull origin "$BRANCH_NAME"
+            git add lib/l10n/arb
+            git commit -m "Sort .arb files [skip ci]"
+            git push origin "HEAD:$BRANCH_NAME"
+          else
+            echo "No changes to commit"
+          fi
+
+  format:
+    runs-on: ubuntu-latest
+    needs: [update_version, generate_licenses, generate_localizations, sort_arb_files]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Required for Flutter action
+      - name: Install jq
+        run: |
+          apt-get update
+          apt-get install -y jq 
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version: 3.41.0
+
+      - name: Get dependencies
+        run: |
+          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.41.0-x64
+          flutter pub get
+
+      - name: Check code format
+        id: check_format
+        continue-on-error: true
+        run: flutter analyze lib test
+
+      - name: Format code
+        if: steps.check_format.outcome == 'failure'
+        env:
+          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
+          BRANCH_NAME: ${{ gitea.ref_name }}
+        run: |
+          git fetch origin "$BRANCH_NAME"
+          git checkout "$BRANCH_NAME"
+          
+          dart fix --apply lib
+          dart fix --apply test
+          
+          if [ -n "$(git status --porcelain lib test)" ]; then
+            git config --global user.name "Gitea Actions [bot]"
+            git config --global user.email "actions@yannick-weigert.de"
+            git config pull.rebase false
+            git pull origin "$BRANCH_NAME"
+            git add lib test
+            git commit -m "Auto-format code [skip ci]"
+            git push origin HEAD:$BRANCH_NAME
+          else
+            echo "No changes to commit"
+          fi
+
+      - name: Verify format
+        run: flutter analyze lib test
+
   build:
+    needs: format
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -40,161 +319,4 @@ jobs:
           flutter pub get
 
       - name: Build APK
-        run: flutter build apk --release
+        run: flutter build apk --release
-  
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      # Required for Flutter action
-      - name: Install jq
-        run: |
-          apt-get update
-          apt-get install -y jq 
-
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-          flutter-version: 3.41.0
-
-      - name: Get dependencies
-        run: |
-          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.41.0-x64
-          flutter pub get
-
-      - name: Run tests
-        run: flutter test
-
-  update_version:
-    runs-on: ubuntu-latest
-    if: gitea.ref == 'refs/heads/development'
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.BOT_TOKEN }}
-          ref: ${{ gitea.ref_name }}
-
-      - name: Increment version number
-        uses: stikkyapp/update-pubspec-version@v2
-        with:
-          strategy: 'patch'
-          path: './pubspec.yaml'
-
-      - name: Commit version update
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-        run: |
-          git config --global user.name "Gitea Actions [bot]"
-          git config --global user.email "actions@yannick-weigert.de"
-          git config pull.rebase false
-          git pull origin ${{ gitea.ref_name }}
-          git add pubspec.yaml
-          git commit -m "Updated version number [skip ci]"
-          git push origin HEAD:${{ gitea.ref_name }}
-
-  generate_licenses:
-    runs-on: ubuntu-latest
-    needs: update_version
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.BOT_TOKEN }}
-          ref: ${{ gitea.ref_name }}
-
-      # Required for Flutter action
-      - name: Install jq
-        run: |
-          apt-get update
-          apt-get install -y jq 
-
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-          flutter-version: 3.41.0
-
-      - name: Get dependencies
-        run: |
-          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.41.0-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
-
-      # 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.41.0
-
-      - name: Get dependencies
-        run: |
-          git config --global --add safe.directory /opt/hostedtoolcache/flutter/stable-3.41.0-x64
-          flutter pub get
-
-      - name: Check code format
-        id: check_format
-        continue-on-error: true
-        run: flutter analyze lib test
-
-      - name: Format code
-        if: steps.check_format.outcome == 'failure'
-        env:
-          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
-        run: |
-          git fetch origin ${{ gitea.ref_name }}
-          git checkout ${{ gitea.ref_name }}
-          
-          dart fix --apply lib
-          dart fix --apply test
-          
-          if [ -n "$(git status --porcelain lib test)" ]; then
-            git config --global user.name "Gitea Actions [bot]"
-            git config --global user.email "actions@yannick-weigert.de"
-            git config pull.rebase false
-            git pull origin ${{ gitea.ref_name }}
-            git add lib test
-            git commit -m "Auto-format code [skip ci]"
-            git push origin HEAD:${{ gitea.ref_name }}
-          else
-            echo "No changes to commit"
-          fi
-
-      - name: Verify format
-        run: flutter analyze lib test

.gitea/workflows/renovate.yaml

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

.gitignore

@@ -3,7 +3,6 @@
 
 # Miscellaneous
 *.class
-*.lock
 *.log
 *.pyc
 *.swp
@@ -79,6 +78,7 @@ unlinked_spec.ds
 local.properties
 
 # iOS/XCode related
+Podfile.lock
 **/ios/**/*.mode1v3
 **/ios/**/*.mode2v3
 **/ios/**/*.moved-aside

lib/l10n/generated/app_localizations.dart

@@ -530,6 +530,12 @@ abstract class AppLocalizations {
   /// **'Live Edit Mode'**
   String get live_edit_mode;
 
+  /// No description provided for @manage_members.
+  ///
+  /// In en, this message translates to:
+  /// **'Manage Members'**
+  String get manage_members;
+
   /// No description provided for @loser.
   ///
   /// In en, this message translates to:
@@ -542,12 +548,6 @@ abstract class AppLocalizations {
   /// **'Lowest Score'**
   String get lowest_score;
 
-  /// No description provided for @manage_members.
-  ///
-  /// In en, this message translates to:
-  /// **'Manage Members'**
-  String get manage_members;
-
   /// No description provided for @match_in_progress.
   ///
   /// In en, this message translates to:

lib/l10n/generated/app_localizations_de.dart

@@ -240,15 +240,15 @@ class AppLocalizationsDe extends AppLocalizations {
   @override
   String get live_edit_mode => 'Live-Bearbeitungsmodus';
 
+  @override
+  String get manage_members => 'Mitglieder bearbeiten';
+
   @override
   String get loser => 'Verlierer:in';
 
   @override
   String get lowest_score => 'Niedrigste Punkte';
 
-  @override
-  String get manage_members => 'Mitglieder bearbeiten';
-
   @override
   String get match_in_progress => 'Spiel läuft...';
 

lib/l10n/generated/app_localizations_en.dart

@@ -240,15 +240,15 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get live_edit_mode => 'Live Edit Mode';
 
+  @override
+  String get manage_members => 'Manage Members';
+
   @override
   String get loser => 'Loser';
 
   @override
   String get lowest_score => 'Lowest Score';
 
-  @override
-  String get manage_members => 'Manage Members';
-
   @override
   String get match_in_progress => 'Match in progress...';
 

pubspec.yaml

@@ -1,7 +1,7 @@
 name: tallee
 description: "Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.30+334
+version: 0.0.33+337
 
 environment:
   sdk: ^3.8.1
@@ -32,6 +32,7 @@ dependencies:
   uuid: ^4.5.2
 
 dev_dependencies:
+  arb_utils: ^0.11.0
   flutter_test:
     sdk: flutter
   build_runner: ^2.7.0

renovate.json

@@ -0,0 +1,32 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended"],
+  "onboarding": false,
+  "requireConfig": "optional",
+  "baseBranches": ["development"],
+  "prHourlyLimit": 0,
+  "prConcurrentLimit": 0,
+  "enabledManagers": ["pub"],
+  "pub": {
+    "enabled": true,
+    "fileMatch": ["(^|/)pubspec\\.yaml$"]
+  },
+  "packageRules": [
+    {
+      "matchManagers": ["pub"],
+      "rangeStrategy": "bump"
+    },
+    {
+      "matchManagers": ["pub"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "groupName": "dart dependencies (non-major)",
+      "groupSlug": "dart-non-major"
+    },
+    {
+      "matchManagers": ["pub"],
+      "matchUpdateTypes": ["major"],
+      "groupName": "dart dependencies (major)",
+      "groupSlug": "dart-major"
+    }
+  ]
+}