Merge remote-tracking branch 'origin/development' into enhancement/138-neues-navbar-design

# Conflicts:
#	pubspec.yaml

README.md

@@ -1,15 +1,7 @@
 # Game Tracker
 
-![Flutter](https://img.shields.io/badge/Created_by-Liquid_Development-027DFD?logo=data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyBpZD0iRWJlbmVfMSIgZGF0YS1uYW1lPSJFYmVuZSAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA3MjUuNDggODk3LjMiPgogIDxkZWZzPgogICAgPHN0eWxlPgogICAgICAuY2xzLTEgewogICAgICAgIGZpbGw6ICNmZmY7CiAgICAgIH0KICAgIDwvc3R5bGU+CiAgPC9kZWZzPgogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTcwNS4yNiw3MDEuOTJsNi40LDExLjA4Yy0xLjk1LTMuODEtNC4wOS03LjUxLTYuNC0xMS4wOFoiLz4KICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik02MDIuMzksODk3LjI1aC03LjIxYzEuMi4wMywyLjQuMDUsMy42MS4wNXMyLjQxLS4wMiwzLjYxLS4wNVoiLz4KICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0wLDY5NS4zOGwyLjY4LTQuNjRjLS45MywxLjUyLTEuODIsMy4wNy0yLjY4LDQuNjRaIi8+CiAgPHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNjgyLjU1LDcyMy40NWw2LjA1LDEwLjQ5Yy0xLjc5LTMuNjQtMy44MS03LjE1LTYuMDUtMTAuNDlaIi8+CiAgPHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMzcuNzIsNzMzLjI4bDUuMy05LjE4Yy0xLjk0LDIuOTQtMy43MSw2LjAxLTUuMyw5LjE4WiIvPgogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTcxMS42Niw3MTMuMDFsLTYuNC0xMS4wOC0yMjAuNDYtMzgxLjg0aDBWMTAxLjg0YzIwLjY3LTYuOTgsMzUuNTYtMjYuNTIsMzUuNTYtNDkuNTQsMC0yOC44OC0yMy40MS01Mi4zLTUyLjMtNTIuM2gtMjA5LjQ4Yy0yOC44OCwwLTUyLjMsMjMuNDEtNTIuMyw1Mi4zLDAsMjIuNzEsMTQuNDgsNDIuMDMsMzQuNyw0OS4yNXYyMTguNTRsLS4zMy41OEwxOC44OSw3MDQuNzlsLTIuNjgsNC42NGMtOS45OSwxOC4xMi0xNS42OCwzOC45Ni0xNS42OCw2MS4xMiwwLDY5Ljk3LDU2LjY0LDEyNi43LDEyNi41MSwxMjYuN2g0NzUuMzVjNjguMy0xLjkxLDEyMy4wOS01Ny44OCwxMjMuMDktMTI2LjY0LDAtMjAuNzQtNC45OS00MC4zMi0xMy44Mi01Ny42Wk02MDguNTYsODYyLjUzSDExNy40M2MtNDkuMzcsMC04OS4zOS00MC4wMi04OS4zOS04OS4zOSwwLTE0LjM2LDMuMzktMjcuOTMsOS40MS0zOS45Nmw1LjMtOS4xOCwyMzMuMi00MDMuOTJoLS4wOFYxMDQuNTloMTcuODFjOS40NywwLDE3LjE1LTcuNjgsMTcuMTUtMTcuMTVzLTcuNjgtMTcuMTUtMTcuMTUtMTcuMTVoLTM1LjU5di0uMDJjLTkuNzItLjI2LTE3LjUyLTguMi0xNy41Mi0xNy45OHM3LjgtMTcuNzIsMTcuNTItMTcuOTh2LS4wMmgyMDkuMjZjOS45NCwwLDE4LDguMDYsMTgsMThzLTguMDYsMTgtMTgsMThoLTM0LjQ4Yy05LjQ3LDAtMTcuMTUsNy42OC0xNy4xNSwxNy4xNXM3LjY4LDE3LjE1LDE3LjE1LDE3LjE1aDE3LjA0djIxNS40OWguMDdsMjMyLjgyLDQwMy4yNiw2LjA2LDEwLjVjNS44MiwxMS44Niw5LjA5LDI1LjIsOS4wOSwzOS4zLDAsNDkuMzctNDAuMDIsODkuMzktODkuMzksODkuMzlaIi8+CiAgPHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMzgxLjY4LDU0NS4zOGMtMy4wOCwxLjY4LTYuMTgsMy4zLTkuMzIsNC44NiwzLjA3LTEuNjcsNi4xOC0zLjI5LDkuMzItNC44NloiLz4KICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik01ODMuNDIsNTUxLjE5bC0yMC42Ny0zNS44Yy0xMy42OS0xLjg0LTI3LjY3LTIuNzktNDEuODYtMi43OS0xNy45OSwwLTM1LjYyLDEuNTMtNTIuNzgsNC40Ni0zMC41Niw1LjIxLTU5LjYsMTQuODktODYuNDIsMjguMzMtMy4wOCwxLjY4LTYuMTgsMy4zLTkuMzIsNC44Ni00MS44OCwyMC45OS04OS4xNiwzMi43OS0xMzkuMTksMzIuNzktMzQuODUsMC02OC4zNS01Ljc0LTk5LjYzLTE2LjMxLDAsMCwwLC4wMiwwLC4wMmwtMTYuNTIsMjguNjFjMzcuMDEsMTUuNTMsNzcuNjUsMjQuMTIsMTIwLjMsMjQuMTIsMTcuOTgsMCwzNS42MS0xLjUzLDUyLjc2LTQuNDYsMzIuNzctNS41OSw2My43OC0xNi4zMSw5Mi4yLTMxLjI5Ljg3LS40NiwxLjczLS45MiwyLjYtMS40LDQzLjI5LTIyLjgyLDkyLjYyLTM1Ljc0LDE0NC45Ni0zNS43NCwxOC4yOCwwLDM2LjE4LDEuNTksNTMuNTksNC42MWwtLjAyLS4wMloiLz4KICA8Zz4KICAgIDxjaXJjbGUgY2xhc3M9ImNscy0xIiBjeD0iNTg3LjY0IiBjeT0iODAzLjQiIHI9IjE4Ljk2Ii8+CiAgICA8cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik01MTUuNTIsNzg0LjQzSDEwMy41NWMtMTAuOTIsMC0xOS43Niw4LjQ5LTE5Ljc2LDE4Ljk2czguODUsMTguOTYsMTkuNzYsMTguOTZoNDExLjk3YzEwLjkyLDAsMTkuNzYtOC40OSwxOS43Ni0xOC45NnMtOC44NS0xOC45Ni0xOS43Ni0xOC45NloiLz4KICA8L2c+CiAgPGNpcmNsZSBjbGFzcz0iY2xzLTEiIGN4PSIyODMuMzIiIGN5PSI0NjcuNTkiIHI9IjE4Ljk2Ii8+CiAgPGNpcmNsZSBjbGFzcz0iY2xzLTEiIGN4PSIzMjYuMjMiIGN5PSIzNjYuMjUiIHI9IjE4Ljk2Ii8+CiAgPHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDA2LjU2LDM4NS4yMmMtMjQuMDYsMC00My41NiwxOS41LTQzLjU2LDQzLjU2czE5LjUsNDMuNTYsNDMuNTYsNDMuNTYsNDMuNTYtMTkuNSw0My41Ni00My41Ni0xOS41LTQzLjU2LTQzLjU2LTQzLjU2Wk00MDYuNTYsNDQ3Ljc0Yy0xMC40NywwLTE4Ljk2LTguNDktMTguOTYtMTguOTZzOC40OS0xOC45NiwxOC45Ni0xOC45NiwxOC45Niw4LjQ5LDE4Ljk2LDE4Ljk2LTguNDksMTguOTYtMTguOTYsMTguOTZaIi8+Cjwvc3ZnPg==)
+![Version](https://img.shields.io/badge/Version-0.3.0-orange)
-
+![Flutter](https://img.shields.io/badge/Flutter-3.32.1-blue?logo=flutter)
-![Version](https://img.shields.io/badge/App--Version-Alpha-orange)
+![Dart](https://img.shields.io/badge/Dart-3.8.1-blue?logo=dart)
-![Flutter](https://img.shields.io/badge/Flutter-3.38.6-027DFD?logo=flutter)
-![Dart](https://img.shields.io/badge/Dart-3.10.7-027DFD?logo=dart)
-
-### Versions Supported
-
-![iOS18](https://img.shields.io/badge/iOS-18.7.1-white?logo=apple)
-![iOS26](https://img.shields.io/badge/iOS-26.2-white?logo=apple)
-![Android16](https://img.shields.io/badge/Android-16-3DDC84?logo=android)
 
 A all-in-one app to track card- and board games, manage players and groups and get statistics about your played games.

lib/core/custom_theme.dart

@@ -11,6 +11,8 @@ class CustomTheme {
   static Color onBoxColor = const Color(0xFF181818);
   static Color boxBorder = const Color(0xFF272727);
   static const Color textColor = Colors.white;
+  static Color navBarItemSelectedColor = primaryColor.withGreen(100);
+  static Color navBarItemUnselectedColor = Colors.grey.shade400;
 
   // ==================== Border Radius ====================
   static const double standardBorderRadius = 12.0;

lib/presentation/views/main_menu/custom_navigation_bar.dart

@@ -1,3 +1,5 @@
+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';
@@ -71,18 +73,66 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
       backgroundColor: CustomTheme.backgroundColor,
       body: tabs[currentIndex],
       extendBody: true,
-      bottomNavigationBar: SafeArea(
+      bottomNavigationBar: SizedBox(
-        minimum: const EdgeInsets.only(bottom: 30),
+        height: 70 + MediaQuery.of(context).padding.bottom,
-        child: Container(
+        child: Stack(
-          margin: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 10),
+          children: [
-          decoration: BoxDecoration(
+            // Dynamically generated blur layers for ultra-smooth transition
-            borderRadius: BorderRadius.circular(24),
+            ...List.generate(34, (index) {
-            color: CustomTheme.primaryColor,
+              // Use cubic curve for an even more natural, smoother transition
+              final progress = index / 34.0; // 0.0 to 1.0
+              final cubic = progress * progress * progress; // cubic curve
+              final blurStrength =
+                  0.5 + (cubic * 50.0); // Very smooth from 0.5 to 50.5
+
+              // Height goes completely from 100% to 0% (all the way down)
+              // With extra density at the bottom for softer transition
+              final heightFactor = index < 25
+                  // First 25 layers: 100% to 30%
+                  ? 1.0 - (progress * 0.7)
+                  // Last 10 layers: 30% to 0% (denser)
+                  : 0.3 - ((index - 25) / 34.0);
+
+              return Positioned(
+                left: 0,
+                right: 0,
+                bottom: 0,
+                height:
+                    (70 + MediaQuery.of(context).padding.bottom) *
+                    heightFactor.clamp(0.05, 1.0),
+                child: ClipRect(
+                  child: BackdropFilter(
+                    filter: ImageFilter.blur(
+                      sigmaX: blurStrength,
+                      sigmaY: blurStrength,
                     ),
-          child: ClipRRect(
+                    child: Container(color: Colors.transparent),
-            borderRadius: BorderRadius.circular(24),
+                  ),
+                ),
+              );
+            }),
+            // Gradient overlay
+            Positioned.fill(
+              child: Container(
+                decoration: BoxDecoration(
+                  gradient: LinearGradient(
+                    begin: Alignment.bottomCenter,
+                    end: Alignment.topCenter,
+                    colors: [
+                      CustomTheme.boxColor.withValues(alpha: 1),
+                      CustomTheme.boxColor.withValues(alpha: 0.5),
+                      CustomTheme.boxColor.withValues(alpha: 0.2),
+                      CustomTheme.boxColor.withValues(alpha: 0.0),
+                    ],
+                    stops: const [0.0, 0.4, 0.8, 1],
+                  ),
+                ),
+              ),
+            ),
+            // Navbar content
+            SafeArea(
               child: SizedBox(
-              height: 60,
+                height: 70,
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.spaceAround,
                   children: <Widget>[
@@ -118,6 +168,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
                 ),
               ),
             ),
+          ],
         ),
       ),
     );

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

@@ -8,7 +8,7 @@ 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/widgets/app_skeleton.dart';
-import 'package:game_tracker/presentation/widgets/buttons/custom_width_button.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';
@@ -79,10 +79,10 @@ class _GroupsViewState extends State<GroupsView> {
             ),
           ),
           Positioned(
-            bottom: MediaQuery.paddingOf(context).bottom,
+            bottom: MediaQuery.paddingOf(context).bottom + 20,
-            child: CustomWidthButton(
+            child: MainMenuButton(
               text: loc.create_group,
-              sizeRelativeToWidth: 0.90,
+              icon: Icons.group_add,
               onPressed: () async {
                 await Navigator.push(
                   context,

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

@@ -1,6 +1,7 @@
 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';
@@ -12,7 +13,7 @@ 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/custom_width_button.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';
@@ -104,10 +105,10 @@ class _MatchViewState extends State<MatchView> {
             ),
           ),
           Positioned(
-            bottom: MediaQuery.paddingOf(context).bottom,
+            bottom: MediaQuery.paddingOf(context).bottom + 20,
-            child: CustomWidthButton(
+            child: MainMenuButton(
-              text: loc.create_match,
+              text: 'Spiel erstellen',
-              sizeRelativeToWidth: 0.90,
+              icon: RpgAwesome.clovers_card,
               onPressed: () async {
                 Navigator.push(
                   context,

lib/presentation/widgets/buttons/main_menu_button.dart

@@ -0,0 +1,98 @@
+import 'package:flutter/material.dart';
+
+/// A button for the main menu with an optional icon and a press animation.
+/// - [text]: The text of the button.
+/// - [icon]: The icon of the button.
+/// - [onPressed]: The callback to be invoked when the button is pressed.
+class MainMenuButton extends StatefulWidget {
+  const MainMenuButton({
+    super.key,
+    required this.text,
+    this.icon,
+    required this.onPressed,
+  });
+
+  /// The text of the button.
+  final String text;
+
+  /// The icon of the button.
+  final IconData? icon;
+
+  /// The callback to be invoked when the button is pressed.
+  final void Function() onPressed;
+
+  @override
+  State<MainMenuButton> createState() => _MainMenuButtonState();
+}
+
+class _MainMenuButtonState extends State<MainMenuButton>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _animationController;
+  late Animation<double> _scaleAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _animationController = AnimationController(
+      duration: const Duration(milliseconds: 100),
+      vsync: this,
+    );
+
+    _scaleAnimation = Tween<double>(begin: 1.0, end: 0.95).animate(
+      CurvedAnimation(parent: _animationController, curve: Curves.easeInOut),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ScaleTransition(
+      scale: _scaleAnimation,
+      child: GestureDetector(
+        onTapDown: (_) {
+          _animationController.forward();
+        },
+        onTapUp: (_) async {
+          await _animationController.reverse();
+          if (mounted) {
+            widget.onPressed();
+          }
+        },
+        onTapCancel: () {
+          _animationController.reverse();
+        },
+        child: Container(
+          decoration: BoxDecoration(
+            color: Colors.white,
+            borderRadius: BorderRadius.circular(30),
+          ),
+          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 14),
+          child: Row(
+            mainAxisSize: MainAxisSize.min,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              if (widget.icon != null) ...[
+                Icon(widget.icon, size: 26, color: Colors.black),
+                const SizedBox(width: 7),
+              ],
+              Text(
+                widget.text,
+                style: const TextStyle(
+                  fontSize: 18,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.black,
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+}

lib/presentation/widgets/navbar_item.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:game_tracker/core/custom_theme.dart';
 
 /// A navigation bar item widget that represents a single tab in a navigation bar.
 /// - [index]: The index of the tab.
@@ -35,7 +36,45 @@ class NavbarItem extends StatefulWidget {
   State<NavbarItem> createState() => _NavbarItemState();
 }
 
-class _NavbarItemState extends State<NavbarItem> {
+class _NavbarItemState extends State<NavbarItem>
+    with SingleTickerProviderStateMixin {
+  /// Animation controller for the scale animation
+  late AnimationController _animationController;
+
+  /// Scale animation for the icon when selected
+  late Animation<double> _scaleAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+    _animationController = AnimationController(
+      duration: const Duration(milliseconds: 300),
+      vsync: this,
+    );
+
+    _scaleAnimation = Tween<double>(begin: 1.0, end: 1.2).animate(
+      CurvedAnimation(
+        parent: _animationController,
+        curve: Curves.easeInOutBack,
+      ),
+    );
+
+    if (widget.isSelected) {
+      _animationController.forward();
+    }
+  }
+
+  // Retrigger animation on selection change
+  @override
+  void didUpdateWidget(NavbarItem oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.isSelected && !oldWidget.isSelected) {
+      _animationController.forward();
+    } else if (!widget.isSelected && oldWidget.isSelected) {
+      _animationController.reverse();
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Expanded(
@@ -48,19 +87,29 @@ class _NavbarItemState extends State<NavbarItem> {
             mainAxisSize: MainAxisSize.min,
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Icon(
+              ScaleTransition(
+                scale: widget.isSelected
+                    ? _scaleAnimation
+                    : const AlwaysStoppedAnimation(1.0),
+                child: Icon(
                   widget.icon,
-                color: widget.isSelected ? Colors.white : Colors.black,
+                  color: widget.isSelected
+                      ? CustomTheme.navBarItemSelectedColor
+                      : CustomTheme.navBarItemUnselectedColor,
+                  size: 32,
+                ),
               ),
               const SizedBox(height: 4),
               Text(
                 widget.label,
                 style: TextStyle(
-                  color: widget.isSelected ? Colors.white : Colors.black,
+                  color: widget.isSelected
-                  fontSize: 12,
+                      ? CustomTheme.navBarItemSelectedColor
+                      : CustomTheme.navBarItemUnselectedColor,
+                  fontSize: widget.isSelected ? 12 : 11,
                   fontWeight: widget.isSelected
                       ? FontWeight.bold
-                      : FontWeight.normal,
+                      : FontWeight.w500,
                 ),
               ),
             ],
@@ -69,4 +118,10 @@ class _NavbarItemState extends State<NavbarItem> {
       ),
     );
   }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
 }

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.5+143
+version: 0.0.6+208
 
 environment:
   sdk: ^3.8.1
@@ -17,6 +17,7 @@ dependencies:
   drift_flutter: ^0.2.4
   file_picker: ^10.3.6
   file_saver: ^0.3.1
+  fluttericon: ^2.0.0
   font_awesome_flutter: ^10.12.0
   intl: any
   json_schema: ^5.2.2
@@ -27,7 +28,6 @@ dependencies:
   url_launcher: ^6.3.2
   uuid: ^4.5.2
 
-
 dev_dependencies:
   flutter_test:
     sdk: flutter