Merge cleaning

# Conflicts:
#	lib/presentation/views/main_menu/settings_view/settings_view.dart

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

@@ -39,7 +39,9 @@ class _SettingsViewState extends State<SettingsView> {
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
     return ScaffoldMessenger(
-      child: Scaffold(
+      child: Builder(
+        builder: (scaffoldMessengerContext) {
+          return Scaffold(
             appBar: AppBar(backgroundColor: CustomTheme.backgroundColor),
             backgroundColor: CustomTheme.backgroundColor,
             body: SingleChildScrollView(
@@ -59,7 +61,11 @@ class _SettingsViewState extends State<SettingsView> {
                     ),
                   ),
                   Padding(
-                padding: const EdgeInsets.only(left: 16, top: 10, bottom: 10),
+                    padding: const EdgeInsets.only(
+                      left: 16,
+                      top: 10,
+                      bottom: 10,
+                    ),
                     child: Text(
                       textAlign: TextAlign.start,
                       loc.data,
@@ -75,13 +81,18 @@ class _SettingsViewState extends State<SettingsView> {
                     suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
                     onPressed: () async {
                       final String json =
-                      await DataTransferService.getAppDataAsJson(context);
+                          await DataTransferService.getAppDataAsJson(
+                            scaffoldMessengerContext,
+                          );
                       final result = await DataTransferService.exportData(
                         json,
                         'game_tracker-data',
                       );
-                  if (!context.mounted) return;
+                      if (!scaffoldMessengerContext.mounted) return;
-                  showExportSnackBar(context: context, result: result);
+                      showExportSnackBar(
+                        context: scaffoldMessengerContext,
+                        result: result,
+                      );
                     },
                   ),
                   SettingsListTile(
@@ -89,9 +100,14 @@ class _SettingsViewState extends State<SettingsView> {
                     icon: Icons.download,
                     suffixWidget: const Icon(Icons.arrow_forward_ios, size: 16),
                     onPressed: () async {
-                  final result = await DataTransferService.importData(context);
+                      final result = await DataTransferService.importData(
-                  if (!context.mounted) return;
+                        scaffoldMessengerContext,
-                  showImportSnackBar(context: context, result: result);
+                      );
+                      if (!scaffoldMessengerContext.mounted) return;
+                      showImportSnackBar(
+                        context: scaffoldMessengerContext,
+                        result: result,
+                      );
                     },
                   ),
                   SettingsListTile(
@@ -107,11 +123,21 @@ class _SettingsViewState extends State<SettingsView> {
                           actions: [
                             AnimatedDialogButton(
                               onPressed: () => Navigator.of(context).pop(false),
-                          child: Text(loc.cancel, style: const TextStyle(color: CustomTheme.textColor)),
+                              child: Text(
+                                loc.cancel,
+                                style: const TextStyle(
+                                  color: CustomTheme.textColor,
+                                ),
+                              ),
                             ),
                             AnimatedDialogButton(
                               onPressed: () => Navigator.of(context).pop(true),
-                          child: Text(loc.delete, style: TextStyle(color: CustomTheme.secondaryColor)),
+                              child: Text(
+                                loc.delete,
+                                style: TextStyle(
+                                  color: CustomTheme.secondaryColor,
+                                ),
+                              ),
                             ),
                           ],
                         ),
@@ -119,7 +145,7 @@ class _SettingsViewState extends State<SettingsView> {
                         if (confirmed == true && context.mounted) {
                           DataTransferService.deleteAllData(context);
                           showSnackbar(
-                        context: context,
+                            context: scaffoldMessengerContext,
                             message: AppLocalizations.of(
                               context,
                             ).data_successfully_deleted,
@@ -129,7 +155,11 @@ class _SettingsViewState extends State<SettingsView> {
                     },
                   ),
                   Padding(
-                padding: const EdgeInsets.only(left: 16, top: 10, bottom: 10),
+                    padding: const EdgeInsets.only(
+                      left: 16,
+                      top: 10,
+                      bottom: 10,
+                    ),
                     child: Text(
                       textAlign: TextAlign.start,
                       loc.legal,
@@ -178,7 +208,9 @@ class _SettingsViewState extends State<SettingsView> {
                                 GestureDetector(
                                   child: const Icon(Icons.language),
                                   onTap: () => {
-                                launchUrl(Uri.parse('https://liquid-dev.de')),
+                                    launchUrl(
+                                      Uri.parse('https://liquid-dev.de'),
+                                    ),
                                   },
                                 ),
                                 GestureDetector(
@@ -227,6 +259,8 @@ class _SettingsViewState extends State<SettingsView> {
                 ],
               ),
             ),
+          );
+        },
       ),
     );
   }
@@ -287,10 +321,11 @@ class _SettingsViewState extends State<SettingsView> {
     Duration duration = const Duration(seconds: 3),
     VoidCallback? action,
   }) {
+    if (!context.mounted) return;
+
     final loc = AppLocalizations.of(context);
-    final messenger = ScaffoldMessenger.of(context);
+    ScaffoldMessenger.of(context).hideCurrentSnackBar();
-    messenger.hideCurrentSnackBar();
+    ScaffoldMessenger.of(context).showSnackBar(
-    messenger.showSnackBar(
       SnackBar(
         content: Text(message, style: const TextStyle(color: Colors.white)),
         backgroundColor: CustomTheme.onBoxColor,

lib/presentation/widgets/buttons/animated_dialog_button.dart

@@ -1,18 +1,20 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-/// A custom animated button widget that provides a scaling and opacity effect
-/// when pressed. This widget is designed to be used in dialogs or other UI
-/// components where a visually appealing button is required.
-///
-/// Parameters:
-/// - [onPressed]: Callback function that is triggered when the button is pressed.
-/// - [child]: The child widget to be displayed inside the button, typically a text or icon.
 class AnimatedDialogButton extends StatefulWidget {
-  const AnimatedDialogButton({super.key, required this.onPressed, required this.child});
+  /// A custom animated button widget that provides a scaling and opacity effect
+  /// when pressed.
+  /// - [onPressed]: Callback function that is triggered when the button is pressed.
+  /// - [child]: The child widget to be displayed inside the button, typically a text or icon.
+  const AnimatedDialogButton({
+    super.key,
+    required this.onPressed,
+    required this.child,
+  });
 
   /// Callback function that is triggered when the button is pressed.
   final VoidCallback onPressed;
+
   /// The child widget to be displayed inside the button, typically a text or icon.
   final Widget child;
 

lib/presentation/widgets/custom_alert_dialog.dart

@@ -1,17 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:game_tracker/core/custom_theme.dart';
 
-/// A custom alert dialog widget that follows the application's design theme.
-///
-/// This widget provides a styled alternative to the default Flutter AlertDialog,
-/// with consistent colors, borders, and layout that match the app's custom theme.
-///
-/// Parameters:
-/// - [title]: The title text displayed at the top of the dialog.
-/// - [content]: The main content text displayed in the body of the dialog.
-/// - [actions]: A list of action widgets (typically buttons) displayed at the bottom
-///   of the dialog. These actions are horizontally spaced around the dialog's width.
 class CustomAlertDialog extends StatelessWidget {
+  /// A custom alert dialog widget that provides a os unspecific AlertDialog,
+  /// with consistent colors, borders, and layout that match the app's custom theme.
+  /// - [title]: The title text displayed at the top of the dialog.
+  /// - [content]: The main content text displayed in the body of the dialog.
+  /// - [actions]: A list of action widgets (typically buttons) displayed at the bottom
+  ///   of the dialog. These actions are horizontally spaced around the dialog's width.
   const CustomAlertDialog({
     super.key,
     required this.title,
@@ -26,8 +22,11 @@ class CustomAlertDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
-      title: Text(title, style: const TextStyle(color: CustomTheme.textColor,),),
+      title: Text(title, style: const TextStyle(color: CustomTheme.textColor)),
-      content: Text(content, style: const TextStyle(color: CustomTheme.textColor),),
+      content: Text(
+        content,
+        style: const TextStyle(color: CustomTheme.textColor),
+      ),
       actions: actions,
       backgroundColor: CustomTheme.boxColor,
       actionsAlignment: MainAxisAlignment.spaceAround,

lib/presentation/widgets/player_selection.dart

@@ -295,6 +295,7 @@ class _PlayerSelectionState extends State<PlayerSelection> {
   /// [message] - The message to display in the snackbar.
   void showSnackBarMessage(String message) {
     if (!context.mounted) return;
+    ScaffoldMessenger.of(context).hideCurrentSnackBar();
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(
         backgroundColor: CustomTheme.boxColor,

pubspec.yaml

@@ -1,7 +1,7 @@
 name: game_tracker
 description: "Game Tracking App for Card Games"
 publish_to: 'none'
-version: 0.0.6+209
+version: 0.0.7+212
 
 environment:
   sdk: ^3.8.1