Workflows um Format Stage erweitern (#175)

Extend workflows with format stage

Co-authored-by: Gitea Actions [bot] <>
Reviewed-on: #175
Reviewed-by: gelbeinhalb <spam@yannick-weigert.de>

.gitea/workflows/pull_request.yaml

@@ -6,23 +6,17 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install jq
-        run: |
-          apt-get update
-          apt-get install -y jq 
-
       - name: Install Flutter (wget)
         run: |
-          wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
+          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
-          # Set Git safe directory for Flutter path
           git config --global --add safe.directory "$(pwd)/flutter"
-          # Set Flutter path
-          echo "$(pwd)/flutter/bin" >> $GITHUB_PATH
+          echo "$(pwd)/flutter/bin" >> $GITEA_PATH
 
       - name: Get dependencies
         run: flutter pub get
@@ -32,26 +26,22 @@ jobs:
 
   test:
     runs-on: ubuntu-latest
+    env:
+      RUNNER_TOOL_CACHE: /toolcache
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install dependencies
-        run: |
-          apt-get update
-          apt-get install -y jq 
-
       - name: Install Flutter (wget)
         run: |
-          wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
+          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
-          # Set Git safe directory for Flutter path
           git config --global --add safe.directory "$(pwd)/flutter"
-          # Set Flutter path
-          echo "$(pwd)/flutter/bin" >> $GITHUB_PATH
+          echo "$(pwd)/flutter/bin" >> $GITEA_PATH
 
       - name: Get dependencies
         run: flutter pub get
 
       - name: Run tests
-        run: flutter test
+        run: flutter test

.gitea/workflows/push.yaml

@@ -7,44 +7,95 @@ on:
       - "main"
 
 jobs:
-  format:
+  test:
     runs-on: ubuntu-latest
-    if: false # Needs bot user
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install dependencies
+      - name: Install Flutter (wget)
         run: |
-          apt-get update
-          apt-get install -y jq 
+          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
+
+      - name: Get dependencies
+        run: flutter pub get
+
+      - name: Run tests
+        run: flutter test
+
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
 
       - name: Install Flutter (wget)
         run: |
-          wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.2-stable.tar.xz
+          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
-          # Set Git safe directory for Flutter path
           git config --global --add safe.directory "$(pwd)/flutter"
-          # Set Flutter path
-          echo "$(pwd)/flutter/bin" >> $GITHUB_PATH
+          echo "$(pwd)/flutter/bin" >> $GITEA_PATH
 
-      - name: Get & upgrade dependencies
-        run: |
-          flutter pub get
-          flutter pub upgrade --major-versions
+      - name: Get dependencies
+        run: flutter pub get
 
-      - name: Auto-format
-        run: |
-          dart format lib
-          dart fix --apply lib 
+      - name: Check code format
+        id: check_format
+        continue-on-error: true
+        run: flutter analyze lib test
 
-        # Needs credentials, push access and the right files need to be staged
-      - name: Commit Changes
+      - name: Format code
+        if: steps.check_format.outcome == 'failure'
+        env:
+          GITEA_TOKEN: ${{ secrets.BOT_TOKEN }}
         run: |
-          git config --global user.name "Gitea Actions"
-          git config --global user.email "actions@gitea.com"
-         git status
-          git add lib/
-          git status
-          git commit -m "Actions: Auto-formatting [skip ci]"
-          git push
+          git fetch origin ${{ gitea.head_ref }}
+          git checkout ${{ gitea.head_ref }}
+          
+          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 add lib test
+            git commit -m "Auto-format code [skip ci]"
+            git push origin HEAD:${{ gitea.head_ref }}
+          else
+            echo "No changes to commit"
+          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.head_ref }}
+
+      - 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.head_ref }}

lib/presentation/widgets/player_selection.dart

@@ -84,6 +84,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           CustomSearchBar(
+            maxLength: Constants.MAX_PLAYER_NAME_LENGTH,
             controller: _searchBarController,
             constraints: const BoxConstraints(maxHeight: 45, minHeight: 45),
             hintText: loc.search_for_players,

lib/presentation/widgets/text_input/custom_search_bar.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:game_tracker/core/constants.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
 class CustomSearchBar extends StatelessWidget {
@@ -22,6 +21,7 @@ class CustomSearchBar extends StatelessWidget {
     this.onTrailingButtonPressed,
     this.onChanged,
     this.constraints,
+    this.maxLength,
   });
 
   /// The controller for the search bar's text input.
@@ -48,15 +48,19 @@ class CustomSearchBar extends StatelessWidget {
   /// The constraints for the search bar.
   final BoxConstraints? constraints;
 
+  /// Optional parameter for maximum length of the input text.
+  final int? maxLength;
+
   @override
   Widget build(BuildContext context) {
     /// Enforce maximum length on the input text
-    const maxLength = Constants.MAX_PLAYER_NAME_LENGTH;
-    if (controller.text.length > maxLength) {
-      controller.text = controller.text.substring(0, maxLength);
-      controller.selection = TextSelection.fromPosition(
-        TextPosition(offset: controller.text.length),
-      );
+    if (maxLength != null) {
+      if (controller.text.length > maxLength!) {
+        controller.text = controller.text.substring(0, maxLength);
+        controller.selection = TextSelection.fromPosition(
+          TextPosition(offset: controller.text.length),
+        );
+      }
     }
 
     return SearchBar(

lib/presentation/widgets/text_input/text_input_field.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
 class TextInputField extends StatelessWidget {
@@ -33,11 +34,14 @@ class TextInputField extends StatelessWidget {
       controller: controller,
       onChanged: onChanged,
       maxLength: maxLength,
+      maxLengthEnforcement: MaxLengthEnforcement.truncateAfterCompositionEnds,
       decoration: InputDecoration(
         filled: true,
         fillColor: CustomTheme.boxColor,
         hintText: hintText,
         hintStyle: const TextStyle(fontSize: 18),
+        // Hides the character counter
+        counterText: '',
         enabledBorder: OutlineInputBorder(
           borderRadius: const BorderRadius.all(Radius.circular(12)),
           borderSide: BorderSide(color: CustomTheme.boxBorder),