Merge Fix

lib/main.dart

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