Merge Fix

lib/main.dart

@@ -111,37 +111,43 @@ class MyHome extends StatelessWidget {
           ),
         ],
       ),
-      body: Container(),
+      body: Consumer<PageProvider>(
-      bottomNavigationBar: GNav(
+        builder: (context, pageProvider, child) {
-        onTabChange: (index) {},
+          return pageProvider.pages[pageProvider.selectedPage];
+        },
+      ),
+      bottomNavigationBar: Padding(
+        padding: EdgeInsets.all(5),
+        child: GNav(
+          onTabChange: (index) {
+            Provider.of<PageProvider>(context, listen: false).changePage(index);
+          },
           gap: 8,
-        backgroundColor: Theme.of(context).colorScheme.secondary,
+          style: GnavStyle.google,
+          backgroundColor: Theme.of(context).colorScheme.surface,
           color: Theme.of(context).colorScheme.onSurface,
           activeColor: Theme.of(context).colorScheme.onPrimary,
           tabBackgroundColor: Theme.of(context).colorScheme.primary,
           tabs: const [
             GButton(
-            icon: Icons.food_bank,
+              icon: Icons.fastfood_outlined,
               text: "Essen",
-          ),
+            ),GButton(
-          GButton(
+              icon: Icons.landscape,
-            icon: Icons.room,
               text: "Ambiente",
-          ),
+            ),GButton(
-          GButton(
+              icon: Icons.mood,
-            icon: Icons.person,
               text: "Service",
-          ),
+            ),GButton(
-          GButton(
+              icon: Icons.feedback,
-            icon: Icons.question_mark,
               text: "Verschläge",
-          ),
+            ), GButton(
-          GButton(
+              icon: Icons.comment,
-            icon: Icons.add_rounded,
               text: "Verbesserungen",
             ),
           ],
         ),
+      ),
     );
   }
 }