Merge branch 'language_translation' into 'main'

Language Change

See merge request brausjonas/mensaapp!13

lib/main.dart

@@ -78,10 +78,187 @@ class MyHome extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<SpaceProvider>(
+    return Consumer<LanguageProvider>(builder: (context, languageProvider, child) {
-      builder: (context, spaceProvider, child) {
+      return Scaffold(
-        return spaceProvider.spaces[spaceProvider.selectedSpace];
+        appBar: AppBar(
+          leading: IconButton(
+            icon: Icon(
+              Icons.home,
+              size: 36,
+              color: Theme.of(context).colorScheme.onPrimary,
+            ),
+            onPressed: () {
+              // Aktion für diesen Button
             },
+          ),
+          title: Consumer<PageProvider>(
+            // Consumer verwenden, um den dynamischen Titel anzuzeigen
+            builder: (context, pageProvider, child) {
+              return Container(
+                height: 40,
+                decoration: BoxDecoration(
+                  color: Theme.of(context).colorScheme.primaryContainer,
+                  borderRadius: BorderRadius.circular(15),
+                ),
+                alignment: Alignment.centerLeft,
+                child: Text(
+                  languageProvider.languageData[Provider.of<LanguageProvider>(context).language]["navBar"][pageProvider.selectedPage.toString()],
+                  // Hier wird der dynamische Titel angezeigt
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.onPrimary,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
               );
+            },
+          ),
+          backgroundColor: Theme.of(context).colorScheme.primary,
+          actions: [
+            IconButton(
+              icon: Opacity(
+                opacity: Provider.of<LanguageProvider>(context).language == "de"
+                    ? 1.0 // Voll sichtbar
+                    : 0.4, // Halb durchsichtig
+                child: Image.asset(
+                  'assets/flags/de.png',
+                  width: 34,
+                  height: 24,
+                  fit: BoxFit.cover,
+                ),
+              ),
+              onPressed: () {
+                Provider.of<LanguageProvider>(context, listen: false)
+                    .setLanguage("de");
+              },
+            ),
+            IconButton(
+              icon: Opacity(
+                opacity: Provider.of<LanguageProvider>(context).language == "en"
+                    ? 1.0 // Voll sichtbar
+                    : 0.4, // Halb durchsichtig
+                child: Image.asset(
+                  'assets/flags/en.png',
+                  width: 34,
+                  height: 24,
+                  fit: BoxFit.cover,
+                ),
+              ),
+              onPressed: () {
+                Provider.of<LanguageProvider>(context, listen: false)
+                    .setLanguage("en");
+              },
+            ),
+            IconButton(
+              icon: Opacity(
+                opacity: Provider.of<LanguageProvider>(context).language == "fr"
+                    ? 1.0 // Voll sichtbar
+                    : 0.4, // Halb durchsichtig
+                child: Image.asset(
+                  'assets/flags/fr.png',
+                  width: 34,
+                  height: 24,
+                  fit: BoxFit.cover,
+                ),
+              ),
+              onPressed: () {
+                Provider.of<LanguageProvider>(context, listen: false)
+                    .setLanguage("fr");
+              },
+            ),
+          ],
+        ),
+        body: Consumer<PageProvider>(
+          builder: (context, pageProvider, child) {
+            return Stack(
+              children: [
+                pageProvider.pages[pageProvider.selectedPage],
+                Positioned(
+                  left: 10,
+                  bottom: 10,
+                  child: IconButton.filled(
+                    padding: const EdgeInsets.all(15),
+                    onPressed: () {
+                      _showDeleteDialog(context); // Dialog anzeigen
+                    },
+                    icon: const Icon(
+                      Icons.delete,
+                      size: 30,
+                    ),
+                    style: ButtonStyle(
+                      shape: WidgetStateProperty.all(RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(17))),
+                      backgroundColor: WidgetStateProperty.all(
+                        Theme.of(context).colorScheme.primary,
+                      ),
+                    ),
+                  ),
+                )
+              ],
+            );
+          },
+        ),
+        floatingActionButton: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text(
+              Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["floating"]["info"],
+              style: TextStyle(fontSize: 15),
+            ),
+            const SizedBox(
+              height: 10,
+            ),
+            FloatingActionButton.extended(
+              onPressed: () {},
+              label: Text(
+                Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["floating"]["return"],
+                style: TextStyle(fontSize: 20),
+              ),
+              icon: const Icon(Icons.send),
+            )
+          ],
+        ),
+        bottomNavigationBar: Container(
+          color: Theme.of(context).colorScheme.secondary,
+          child: Padding(
+            padding: const EdgeInsets.all(5),
+            child: GNav(
+              onTabChange: (index) {
+                Provider.of<PageProvider>(context, listen: false)
+                    .changePage(index);
+              },
+              gap: 8,
+              style: GnavStyle.google,
+              backgroundColor: Colors.transparent,
+              color: Theme.of(context).colorScheme.onSurface,
+              activeColor: Theme.of(context).colorScheme.onPrimary,
+              tabBackgroundColor: Theme.of(context).colorScheme.primary,
+              tabs: [
+                GButton(
+                  icon: Icons.fastfood_outlined,
+                  text: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["navBar"]["0"],
+                ),
+                GButton(
+                  icon: Icons.chair, /* prev: landscape*/
+                  text: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["navBar"]["1"],
+                ),
+                GButton(
+                  icon: Icons.mood,
+                  text: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["navBar"]["2"],
+                ),
+                GButton(
+                  icon: Icons.feedback,
+                  text: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["navBar"]["3"],
+                ),
+                GButton(
+                  icon: Icons.grass,
+                  text: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["navBar"]["4"],
+                ),
+              ],
+            ),
+          ),
+        ),
+      );
+    });
+
   }
 }

lib/pages/pageAmbiente.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mensaapp/providers/languageProvider.dart';
 import 'package:provider/provider.dart';
 
 import '../modules/ratingStars.dart';
@@ -9,6 +10,7 @@ class PageAmbiente extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    return Consumer<LanguageProvider>(builder: (context, languageProvider, child){
       return Scaffold(
         body: Stack(
           children: [
@@ -44,8 +46,8 @@ class PageAmbiente extends StatelessWidget {
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                        const Text(
+                          Text(
-                          "Frage1*",
+                            Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageAmbiente"]["question1"],
                             style: TextStyle(fontSize: 35),
                           ),
                           Consumer<AmbienteProvider>(
@@ -60,8 +62,8 @@ class PageAmbiente extends StatelessWidget {
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                        const Text(
+                          Text(
-                          "Frage2*",
+                            Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageAmbiente"]["question2"],
                             style: TextStyle(fontSize: 35),
                           ),
                           Consumer<AmbienteProvider>(
@@ -87,7 +89,7 @@ class PageAmbiente extends StatelessWidget {
                             maxLength: 500,
                             maxLines: 4,
                             decoration: InputDecoration(
-                            labelText: "Dein Feedback (optional)",
+                              labelText: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["textfield"],
                               labelStyle: const TextStyle(fontSize: 20),
                               border: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(15)
@@ -106,4 +108,6 @@ class PageAmbiente extends StatelessWidget {
         ),
       );
     }
+    );
+  }
 }

lib/pages/pageAnmerkungen.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mensaapp/providers/anmerkungProvider.dart';
+import 'package:mensaapp/providers/languageProvider.dart';
 import 'package:provider/provider.dart';
 
 import '../modules/ratingStars.dart';
@@ -9,6 +10,8 @@ class PageAnmerkungen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    return Consumer<LanguageProvider>(builder: (context, languageProvider, child)
+    {
       return Scaffold(
         body: Stack(
           children: [
@@ -41,8 +44,8 @@ class PageAnmerkungen extends StatelessWidget {
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                        const Text(
+                          Text(
-                          "Frage1*",
+                            Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageAnmerkungen"]["question1"],
                             style: TextStyle(fontSize: 35),
                           ),
                           Consumer<AnmerkungProvider>(
@@ -60,8 +63,8 @@ class PageAnmerkungen extends StatelessWidget {
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                        const Text(
+                          Text(
-                          "Frage2*",
+                            Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageAnmerkungen"]["question2"],
                             style: TextStyle(fontSize: 35),
                           ),
                           Consumer<AnmerkungProvider>(
@@ -90,7 +93,7 @@ class PageAnmerkungen extends StatelessWidget {
                             maxLength: 500,
                             maxLines: 4,
                             decoration: InputDecoration(
-                            labelText: "Dein Feedback (optional)",
+                              labelText: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["textfield"],
                               labelStyle: const TextStyle(fontSize: 20),
                               border: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(15)),
@@ -107,5 +110,6 @@ class PageAnmerkungen extends StatelessWidget {
           ],
         ),
       );
+    });
   }
 }

lib/pages/pageEssen.dart

@@ -4,6 +4,7 @@ import 'package:mensaapp/modules/fetchMenu.dart';
 import 'package:mensaapp/modules/ratingEmote.dart';
 import 'package:mensaapp/modules/ratingStars.dart';
 import 'package:mensaapp/providers/essenProvider.dart';
+import 'package:mensaapp/providers/languageProvider.dart';
 import 'package:mensaapp/providers/pageProvider.dart';
 import 'package:provider/provider.dart';
 
@@ -12,6 +13,7 @@ class PageEssen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    return Consumer<LanguageProvider>(builder: (context, languageProvider, child){
       return Scaffold(
         body: Stack(
           children: [
@@ -64,8 +66,8 @@ class PageEssen extends StatelessWidget {
                           Row(
                             mainAxisAlignment: MainAxisAlignment.spaceBetween,
                             children: [
-                            const Text(
+                              Text(
-                              "Geschmack*",
+                                Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageEssen"]["question1"],
                                 style: TextStyle(fontSize: 35),
                               ),
                               Consumer<EssenProvider>(
@@ -83,8 +85,8 @@ class PageEssen extends StatelessWidget {
                           Row(
                             mainAxisAlignment: MainAxisAlignment.spaceBetween,
                             children: [
-                            const Text(
+                              Text(
-                              "Qualität*",
+                                Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageEssen"]["question2"],
                                 style: TextStyle(fontSize: 35),
                               ),
                               Consumer<EssenProvider>(
@@ -113,7 +115,7 @@ class PageEssen extends StatelessWidget {
                                 maxLength: 500,
                                 maxLines: 4,
                                 decoration: InputDecoration(
-                                labelText: "Dein Feedback (optional)",
+                                  labelText: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["textfield"],
                                   labelStyle: const TextStyle(fontSize: 20),
                                   border: OutlineInputBorder(
                                     borderRadius: BorderRadius.circular(15),
@@ -133,5 +135,6 @@ class PageEssen extends StatelessWidget {
           ],
         ),
       );
+    });
   }
 }

lib/pages/pageService.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:mensaapp/providers/languageProvider.dart';
 import 'package:mensaapp/providers/serviceProvider.dart';
 import 'package:provider/provider.dart';
 
@@ -9,6 +10,7 @@ class PageService extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    return Consumer<LanguageProvider>(builder: (context, languageProvider, child){
       return Scaffold(
         body: Stack(
           children: [
@@ -46,8 +48,8 @@ class PageService extends StatelessWidget {
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                        const Text(
+                          Text(
-                          "Frage1*",
+                            Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageService"]["question1"],
                             style: TextStyle(fontSize: 35),
                           ),
                           Consumer<ServiceProvider>(
@@ -62,8 +64,8 @@ class PageService extends StatelessWidget {
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                        const Text(
+                          Text(
-                          "Frage2*",
+                            Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageService"]["question2"],
                             style: TextStyle(fontSize: 35),
                           ),
                           Consumer<ServiceProvider>(
@@ -89,7 +91,7 @@ class PageService extends StatelessWidget {
                             maxLength: 500,
                             maxLines: 4,
                             decoration: InputDecoration(
-                            labelText: "Dein Feedback (optional)",
+                              labelText: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["textfield"],
                               labelStyle: const TextStyle(fontSize: 20),
                               border: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(15)
@@ -107,5 +109,6 @@ class PageService extends StatelessWidget {
           ],
         ),
       );
+    });
   }
 }

lib/pages/pageSpezielleErnaehrung.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_rating_bar/flutter_rating_bar.dart';
 import 'package:mensaapp/modules/ratingEmote.dart';
 import 'package:mensaapp/modules/ratingStars.dart';
+import 'package:mensaapp/providers/languageProvider.dart';
 import 'package:mensaapp/providers/spezielleErnaehrungProvider.dart';
 
 import 'package:provider/provider.dart';
@@ -11,6 +12,7 @@ class PageSpezielleErnaehrung extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    return Consumer<LanguageProvider>(builder: (context, languageProvider, child) {
       return Scaffold(
         body: Stack(
           children: [
@@ -43,8 +45,8 @@ class PageSpezielleErnaehrung extends StatelessWidget {
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                        const Text(
+                          Text(
-                          "Vegan?*",
+                            Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageSpecial"]["question1"],
                             style: TextStyle(fontSize: 35),
                           ),
                           Consumer<SpezielleErnaehrungProvider>(
@@ -65,8 +67,8 @@ class PageSpezielleErnaehrung extends StatelessWidget {
                       Row(
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                        const Text(
+                          Text(
-                          "Keine Ahnung*",
+                            Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["pageSpecial"]["question2"],
                             style: TextStyle(fontSize: 35),
                           ),
                           Consumer<SpezielleErnaehrungProvider>(
@@ -98,7 +100,7 @@ class PageSpezielleErnaehrung extends StatelessWidget {
                             maxLength: 500,
                             maxLines: 5,
                             decoration: InputDecoration(
-                            labelText: "Dein Feedback (optional)",
+                              labelText: Provider.of<LanguageProvider>(context).languageData[Provider.of<LanguageProvider>(context).language]["textfield"],
                               labelStyle: const TextStyle(fontSize: 20),
                               border: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(15)),
@@ -115,5 +117,6 @@ class PageSpezielleErnaehrung extends StatelessWidget {
           ],
         ),
       );
+    });
   }
 }

lib/providers/languageProvider.dart

@@ -6,23 +6,21 @@ class LanguageProvider extends ChangeNotifier {
   Map<String, dynamic> languageData = {
     "de":
     {
+    "textfield": "Dein Feedback",
     "pageAmbiente":
       {
         "question1": "Frage1",
         "question2": "Frage2",
-        "textfield": "Dein Feedback"
       },
       "pageAnmerkungen":
       {
         "question1": "Frage1",
         "question2": "Frage2",
-        "textfield": "Dein Feedback"
       },
       "pageEssen":
       {
         "question1": "Geschmack",
         "question2": "Qualität",
-        "textfield": "Dein Feedback"
       },
       "pageHome":
       {
@@ -32,21 +30,19 @@ class LanguageProvider extends ChangeNotifier {
       {
         "question1": "Frage1",
         "question2": "Frage2",
-        "textfield": "Dein Feedback"
       },
       "pageSpecial":
       {
         "question1": "Frage1",
         "question2": "Frage2",
-        "textfield": "Dein Feedback"
       },
       "navBar":
       {
-        "symbol1": "Essen",
+        "0": "Essen",
-        "symbol2": "Ambiente",
+        "1": "Ambiente",
-        "symbol3": "Service",
+        "2": "Service",
-        "symbol4": "Anmerkungen",
+        "3": "Anmerkungen",
-        "symbol5": "Spezielle Ernährung"
+        "4": "Spezielle Ernährung"
       },
       "floating":
       {
@@ -63,20 +59,18 @@ class LanguageProvider extends ChangeNotifier {
     },
     "en":
     {
+    "textfield": "Your Feedback",
     "pageAmbiente": {
         "question1": "Question1",
         "question2": "Question2",
-        "textfield": "Your Feedback"
       },
       "pageAnmerkungen": {
         "question1": "Question1",
         "question2": "Question2",
-        "textfield": "Your Feedback"
       },
       "pageEssen": {
         "question1": "Taste",
         "question2": "Quality",
-        "textfield": "Your Feedback"
       },
       "pageHome": {
 
@@ -84,19 +78,17 @@ class LanguageProvider extends ChangeNotifier {
       "pageService": {
         "question1": "Question1",
         "question2": "Question2",
-        "textfield": "Your Feedback"
       },
       "pageSpecial": {
         "question1": "Question1",
         "question2": "Question2",
-        "textfield": "Your Feedback"
       },
       "navBar": {
-        "symbol1": "Food",
+        "0": "Food",
-        "symbol2": "Ambience",
+        "1": "Ambience",
-        "symbol3": "Service",
+        "2": "Service",
-        "symbol4": "Remarks",
+        "3": "Remarks",
-        "symbol5": "Special Diet"
+        "4": "Special Diet"
       },
       "floating": {
         "info": "* Required field",
@@ -112,20 +104,18 @@ class LanguageProvider extends ChangeNotifier {
     },
     "fr":
     {
+    "textfield": "Votre avis",
     "pageAmbiente": {
         "question1": "Question1",
         "question2": "Question2",
-        "textfield": "Votre avis"
       },
       "pageAnmerkungen": {
         "question1": "Question1",
         "question2": "Question2",
-        "textfield": "Votre avis"
       },
       "pageEssen": {
         "question1": "Goût",
         "question2": "Qualité",
-        "textfield": "Votre avis"
       },
       "pageHome": {
 
@@ -133,19 +123,17 @@ class LanguageProvider extends ChangeNotifier {
       "pageService": {
         "question1": "Question1",
         "question2": "Question2",
-        "textfield": "Votre avis"
       },
       "pageSpecial": {
         "question1": "Question1",
         "question2": "Question2",
-        "textfield": "Votre avis"
       },
       "navBar": {
-        "symbol1": "Nourriture",
+        "0": "Nourriture",
-        "symbol2": "Ambiance",
+        "1": "Ambiance",
-        "symbol3": "Service",
+        "2": "Service",
-        "symbol4": "Remarques",
+        "3": "Remarques",
-        "symbol5": "Régime spécial"
+        "4": "Régime spécial"
       },
       "floating": {
         "info": "* Champ obligatoire",

lib/providers/pageProvider.dart

@@ -18,14 +18,6 @@ class PageProvider extends ChangeNotifier {
     const PageSpezielleErnaehrung()
   ];
 
-  List<String> titleString = [
-    "Essen",
-    "Ambiente",
-    "Service",
-    "Anmerkungen",
-    "Spezielle Ernährung"
-  ];
-
   void changePage(int index) {
     selectedPage = index;
     notifyListeners();