From 28ed22ce732bdfe9ee1fabf6c0e9f59c6733df89 Mon Sep 17 00:00:00 2001
From: mathiskirchner <mathis.kirchner.mk@gmail.com>
Date: Sat, 22 Nov 2025 17:40:00 +0100
Subject: [PATCH] wrap navbar in SafeArea and replaced Material with Container

---
 .../main_menu/custom_navigation_bar.dart      | 129 +++++++++---------
 1 file changed, 63 insertions(+), 66 deletions(-)

diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart
index 709d541..9727bc0 100644
--- a/lib/presentation/views/main_menu/custom_navigation_bar.dart
+++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart
@@ -31,76 +31,73 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
 
   @override
   Widget build(BuildContext context) {
-    return Container(
-      decoration: BoxDecoration(color: CustomTheme.backgroundColor),
-      child: SafeArea(
-        minimum: EdgeInsets.symmetric(vertical: 30),
-        child: Scaffold(
-          appBar: AppBar(
-            centerTitle: true,
-            title: Text(
-              _currentTabTitle(),
-              style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+    return Scaffold(
+      appBar: AppBar(
+        centerTitle: true,
+        title: Text(
+          _currentTabTitle(),
+          style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+        ),
+        backgroundColor: CustomTheme.backgroundColor,
+        scrolledUnderElevation: 0,
+        actions: [
+          IconButton(
+            onPressed: () => Navigator.push(
+              context,
+              MaterialPageRoute(builder: (_) => const SettingsView()),
             ),
-            backgroundColor: CustomTheme.backgroundColor,
-            scrolledUnderElevation: 0,
-            actions: [
-              IconButton(
-                onPressed: () => Navigator.push(
-                  context,
-                  MaterialPageRoute(builder: (_) => const SettingsView()),
-                ),
-                icon: const Icon(Icons.settings),
-              ),
-            ],
-            elevation: 0,
+            icon: const Icon(Icons.settings),
           ),
-          backgroundColor: CustomTheme.backgroundColor,
-          body: tabs[currentIndex],
-          extendBody: true,
-          bottomNavigationBar: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 12.0),
-            child: Material(
-              elevation: 10,
+        ],
+        elevation: 0,
+      ),
+      backgroundColor: CustomTheme.backgroundColor,
+      body: tabs[currentIndex],
+      extendBody: true,
+      bottomNavigationBar: SafeArea(
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 12.0),
+          child: Container(
+            decoration: BoxDecoration(
               borderRadius: BorderRadius.circular(24),
               color: CustomTheme.primaryColor,
-              child: ClipRRect(
-                borderRadius: BorderRadius.circular(24),
-                child: SizedBox(
-                  height: 60,
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceAround,
-                    children: <Widget>[
-                      NavbarItem(
-                        index: 0,
-                        isSelected: currentIndex == 0,
-                        icon: Icons.home_rounded,
-                        label: 'Home',
-                        onTabTapped: onTabTapped,
-                      ),
-                      NavbarItem(
-                        index: 1,
-                        isSelected: currentIndex == 1,
-                        icon: Icons.gamepad_rounded,
-                        label: 'Games',
-                        onTabTapped: onTabTapped,
-                      ),
-                      NavbarItem(
-                        index: 2,
-                        isSelected: currentIndex == 2,
-                        icon: Icons.group_rounded,
-                        label: 'Groups',
-                        onTabTapped: onTabTapped,
-                      ),
-                      NavbarItem(
-                        index: 3,
-                        isSelected: currentIndex == 3,
-                        icon: Icons.bar_chart_rounded,
-                        label: 'Stats',
-                        onTabTapped: onTabTapped,
-                      ),
-                    ],
-                  ),
+            ),
+            child: ClipRRect(
+              borderRadius: BorderRadius.circular(24),
+              child: SizedBox(
+                height: 60,
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceAround,
+                  children: <Widget>[
+                    NavbarItem(
+                      index: 0,
+                      isSelected: currentIndex == 0,
+                      icon: Icons.home_rounded,
+                      label: 'Home',
+                      onTabTapped: onTabTapped,
+                    ),
+                    NavbarItem(
+                      index: 1,
+                      isSelected: currentIndex == 1,
+                      icon: Icons.gamepad_rounded,
+                      label: 'Games',
+                      onTabTapped: onTabTapped,
+                    ),
+                    NavbarItem(
+                      index: 2,
+                      isSelected: currentIndex == 2,
+                      icon: Icons.group_rounded,
+                      label: 'Groups',
+                      onTabTapped: onTabTapped,
+                    ),
+                    NavbarItem(
+                      index: 3,
+                      isSelected: currentIndex == 3,
+                      icon: Icons.bar_chart_rounded,
+                      label: 'Stats',
+                      onTabTapped: onTabTapped,
+                    ),
+                  ],
                 ),
               ),
             ),