merge fix

# Conflicts:
#	lib/presentation/views/main_menu/group_view/create_group_view.dart
#	pubspec.yaml

lib/presentation/views/main_menu/custom_navigation_bar.dart

@@ -4,7 +4,7 @@ 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/group_view/group_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';

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

@@ -10,17 +10,17 @@ 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';
 
-class GroupCreateView extends StatefulWidget {
-  const GroupCreateView({super.key, this.groupToEdit});
+class CreateGroupView extends StatefulWidget {
+  const CreateGroupView({super.key, this.groupToEdit});
 
   /// The group to edit, if any
   final Group? groupToEdit;
 
   @override
-  State<GroupCreateView> createState() => _GroupCreateViewState();
+  State<CreateGroupView> createState() => _CreateGroupViewState();
 }
 
-class _GroupCreateViewState extends State<GroupCreateView> {
+class _CreateGroupViewState extends State<CreateGroupView> {
   late final AppDatabase db;
 
   /// GlobalKey for ScaffoldMessenger to show snackbars
@@ -63,6 +63,7 @@ class _GroupCreateViewState extends State<GroupCreateView> {
     return ScaffoldMessenger(
       key: _scaffoldMessengerKey,
       child: Scaffold(
+        resizeToAvoidBottomInset: false,
         backgroundColor: CustomTheme.backgroundColor,
         appBar: AppBar(title: Text(widget.groupToEdit == null ? loc.create_new_group : loc.edit_group), actions: widget.groupToEdit == null ? [] : [IconButton(icon: const Icon(Icons.delete), onPressed: () async {
           if(widget.groupToEdit != null) {

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

@@ -6,7 +6,7 @@ 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/group_view/group_create_view.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/animated_dialog_button.dart';
 import 'package:game_tracker/presentation/widgets/buttons/main_menu_button.dart';
@@ -188,7 +188,7 @@ class _GroupDetailViewState extends State<GroupDetailView> {
                     context,
                     adaptivePageRoute(
                       builder: (context) {
-                        return GroupCreateView(
+                        return CreateGroupView(
                           groupToEdit: _group,
                         );
                       },

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

@@ -7,7 +7,7 @@ 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/group_detail_view.dart';
-import 'package:game_tracker/presentation/views/main_menu/group_view/group_create_view.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/main_menu_button.dart';
 import 'package:game_tracker/presentation/widgets/tiles/group_tile.dart';
@@ -105,7 +105,7 @@ class _GroupsViewState extends State<GroupsView> {
                   context,
                   adaptivePageRoute(
                     builder: (context) {
-                      return const GroupCreateView();
+                      return const CreateGroupView();
                     },
                   ),
                 );

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

@@ -43,6 +43,7 @@ class _ChooseGameViewState extends State<ChooseGameView> {
     final loc = AppLocalizations.of(context);
     return Scaffold(
       backgroundColor: CustomTheme.backgroundColor,
+      resizeToAvoidBottomInset: false,
       appBar: AppBar(
         leading: IconButton(
           icon: const Icon(Icons.arrow_back_ios),

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

@@ -43,6 +43,7 @@ class _ChooseGroupViewState extends State<ChooseGroupView> {
     final loc = AppLocalizations.of(context);
     return Scaffold(
       backgroundColor: CustomTheme.backgroundColor,
+      resizeToAvoidBottomInset: false,
       appBar: AppBar(
         leading: IconButton(
           icon: const Icon(Icons.arrow_back_ios),

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

@@ -112,6 +112,7 @@ class _CreateMatchViewState extends State<CreateMatchView> {
     return ScaffoldMessenger(
       key: _scaffoldMessengerKey,
       child: Scaffold(
+        resizeToAvoidBottomInset: false,
         backgroundColor: CustomTheme.backgroundColor,
         appBar: AppBar(title: Text(loc.create_new_match)),
         body: SafeArea(

pubspec.yaml

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