jonas/mensaapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge fix, aber home-button putt

Browse Source
This commit is contained in:
Jonas Braus
2024-11-25 14:40:42 +01:00
parent b5203caed0
commit 5e77e4c1b3
2 changed files with 223 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/main.dart
+5 -182
View File
@@ -78,187 +78,10 @@ class MyHome extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Consumer<LanguageProvider>(builder: (context, languageProvider, child) { return Consumer<SpaceProvider>(
return Scaffold( builder: (context, spaceProvider, child) {
appBar: AppBar( return spaceProvider.spaces[spaceProvider.selectedSpace];
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/spaces/spaceRate.dart
+218 -186
View File
@@ -22,33 +22,52 @@ class SpaceRate extends StatelessWidget {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),
title: Text(Provider.of<LanguageProvider>(context, listen: false).languageData[Provider.of<LanguageProvider>(context, listen: false).language]["floating"]["delete"]["title"]), title: Text(Provider.of<LanguageProvider>(context, listen: false)
content: Text(Provider.of<LanguageProvider>(context, listen: false).languageData[Provider.of<LanguageProvider>(context, listen: false).language]["floating"]["delete"]["info"], .languageData[
style: TextStyle(fontSize: 18),), Provider.of<LanguageProvider>(context, listen: false)
.language]["floating"]["delete"]["title"]),
content: Text(
Provider.of<LanguageProvider>(context, listen: false).languageData[
Provider.of<LanguageProvider>(context, listen: false)
.language]["floating"]["delete"]["info"],
style: TextStyle(fontSize: 18),
),
actions: [ actions: [
ElevatedButton( ElevatedButton(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
child: Text(Provider.of<LanguageProvider>(context, listen: false).languageData[Provider.of<LanguageProvider>(context, listen: false).language]["floating"]["delete"]["keep"]), child: Text(Provider.of<LanguageProvider>(context, listen: false)
.languageData[
Provider.of<LanguageProvider>(context, listen: false)
.language]["floating"]["delete"]["keep"]),
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.secondary backgroundColor: Theme.of(context).colorScheme.secondary),
),
), ),
ElevatedButton( ElevatedButton(
onPressed: () { onPressed: () {
Provider.of<AnmerkungProvider>(context, listen: false).resetAllFields(); Provider.of<AnmerkungProvider>(context, listen: false)
Provider.of<EssenProvider>(context, listen: false).resetAllFields(); .resetAllFields();
Provider.of<AmbienteProvider>(context, listen: false).resetAllFields(); Provider.of<EssenProvider>(context, listen: false)
Provider.of<ServiceProvider>(context, listen: false).resetAllFields(); .resetAllFields();
Provider.of<SpezielleErnaehrungProvider>(context, listen: false).resetAllFields(); Provider.of<AmbienteProvider>(context, listen: false)
Provider.of<PageProvider>(context, listen: false).resetSelectedEssen(); .resetAllFields();
Provider.of<SpaceProvider>(context, listen: false).setSelectedSpace(0); Provider.of<ServiceProvider>(context, listen: false)
.resetAllFields();
Provider.of<SpezielleErnaehrungProvider>(context, listen: false)
.resetAllFields();
Provider.of<PageProvider>(context, listen: false)
.resetSelectedEssen();
Provider.of<SpaceProvider>(context, listen: false)
.setSelectedSpace(0);
// Hier Aktion für Löschen ausführen // Hier Aktion für Löschen ausführen
Navigator.of(context).pop(); // Dialog schließen Navigator.of(context).pop(); // Dialog schließen
}, },
child: Text(Provider.of<LanguageProvider>(context, listen: false).languageData[Provider.of<LanguageProvider>(context, listen: false).language]["floating"]["delete"]["del"]), child: Text(Provider.of<LanguageProvider>(context, listen: false)
.languageData[
Provider.of<LanguageProvider>(context, listen: false)
.language]["floating"]["delete"]["del"]),
) )
], ],
); );
@@ -58,190 +77,203 @@ class SpaceRate extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Consumer<LanguageProvider>(builder: (context, languageProvider, x) {
appBar: AppBar( return Scaffold(
leading: IconButton( appBar: AppBar(
icon: Icon( leading: IconButton(
Icons.home_rounded, icon: Icon(
size: 36, Icons.home,
color: Theme.of(context).colorScheme.onPrimary, size: 36,
color: Theme.of(context).colorScheme.onPrimary,
),
onPressed: () {
// Aktion für diesen Button
},
), ),
onPressed: () { title: Consumer<PageProvider>(
Provider.of<AnmerkungProvider>(context, listen: false).resetAllFields(); // Consumer verwenden, um den dynamischen Titel anzuzeigen
Provider.of<EssenProvider>(context, listen: false).resetAllFields(); builder: (context, pageProvider, child) {
Provider.of<AmbienteProvider>(context, listen: false).resetAllFields(); return Container(
Provider.of<ServiceProvider>(context, listen: false).resetAllFields(); height: 40,
Provider.of<SpezielleErnaehrungProvider>(context, listen: false).resetAllFields(); decoration: BoxDecoration(
Provider.of<PageProvider>(context, listen: false).resetSelectedEssen(); color: Theme.of(context).colorScheme.primaryContainer,
Provider.of<SpaceProvider>(context, listen: false).setSelectedSpace(0); borderRadius: BorderRadius.circular(15),
}, ),
), alignment: Alignment.centerLeft,
title: Consumer<PageProvider>( child: Text(
// Consumer verwenden, um den dynamischen Titel anzuzeigen languageProvider.languageData[
builder: (context, pageProvider, child) { Provider.of<LanguageProvider>(context).language]
return Container( ["navBar"][pageProvider.selectedPage.toString()],
height: 40, // Hier wird der dynamische Titel angezeigt
decoration: BoxDecoration( style: TextStyle(
color: Theme.of(context).colorScheme.primaryContainer, color: Theme.of(context).colorScheme.onPrimary,
borderRadius: BorderRadius.circular(15), fontWeight: FontWeight.bold,
), ),
alignment: Alignment.centerLeft, ),
child: Text( );
pageProvider.titleString[pageProvider.selectedPage], },
// Hier wird der dynamische Titel angezeigt ),
style: TextStyle( backgroundColor: Theme.of(context).colorScheme.primary,
color: Theme.of(context).colorScheme.onPrimary, actions: [
fontWeight: FontWeight.bold, 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,
),
),
),
)
],
); );
}, },
), ),
backgroundColor: Theme.of(context).colorScheme.primary, floatingActionButton: Column(
actions: [ mainAxisSize: MainAxisSize.min,
IconButton( children: [
icon: Opacity( Text(
opacity: Provider.of<LanguageProvider>(context).language == "de" Provider.of<LanguageProvider>(context).languageData[
? 1.0 // Voll sichtbar Provider.of<LanguageProvider>(context).language]
: 0.4, // Halb durchsichtig ["floating"]["info"],
child: Image.asset( style: TextStyle(fontSize: 15),
'assets/flags/de.png',
width: 34,
height: 24,
fit: BoxFit.cover,
),
), ),
onPressed: () { const SizedBox(
Provider.of<LanguageProvider>(context, listen: false) height: 10,
.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: () { FloatingActionButton.extended(
Provider.of<LanguageProvider>(context, listen: false) onPressed: () {},
.setLanguage("en"); label: Text(
}, Provider.of<LanguageProvider>(context).languageData[
), Provider.of<LanguageProvider>(context).language]
IconButton( ["floating"]["return"],
icon: Opacity( style: TextStyle(fontSize: 20),
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,
), ),
), icon: const Icon(Icons.send),
onPressed: () { )
Provider.of<LanguageProvider>(context, listen: false) ],
.setLanguage("fr"); ),
}, bottomNavigationBar: Container(
), color: Theme.of(context).colorScheme.secondary,
], child: Padding(
), padding: const EdgeInsets.all(5),
body: Consumer<PageProvider>( child: GNav(
builder: (context, pageProvider, child) { onTabChange: (index) {
return Stack( Provider.of<PageProvider>(context, listen: false)
children: [ .changePage(index);
pageProvider.pages[pageProvider.selectedPage], },
Positioned( gap: 8,
left: 10, style: GnavStyle.google,
bottom: 10, backgroundColor: Colors.transparent,
child: IconButton.filled( color: Theme.of(context).colorScheme.onSurface,
padding: const EdgeInsets.all(15), activeColor: Theme.of(context).colorScheme.onPrimary,
onPressed: () { tabBackgroundColor: Theme.of(context).colorScheme.primary,
_showDeleteDialog(context); // Dialog anzeigen tabs: [
}, GButton(
icon: const Icon( icon: Icons.fastfood_outlined,
Icons.delete, text: Provider.of<LanguageProvider>(context).languageData[
size: 30, Provider.of<LanguageProvider>(context).language]
), ["navBar"]["0"],
style: ButtonStyle(
shape: WidgetStateProperty.all(RoundedRectangleBorder(
borderRadius: BorderRadius.circular(17))),
backgroundColor: WidgetStateProperty.all(
Theme.of(context).colorScheme.primary,
),
),
), ),
) GButton(
], icon: Icons.chair,
); /* prev: landscape*/
}, text: Provider.of<LanguageProvider>(context).languageData[
), Provider.of<LanguageProvider>(context).language]
floatingActionButton: Column( ["navBar"]["1"],
mainAxisSize: MainAxisSize.min, ),
children: [ GButton(
const Text( icon: Icons.mood,
"* Pflichtfeld", text: Provider.of<LanguageProvider>(context).languageData[
style: TextStyle(fontSize: 15), Provider.of<LanguageProvider>(context).language]
), ["navBar"]["2"],
const SizedBox( ),
height: 10, GButton(
), icon: Icons.feedback,
FloatingActionButton.extended( text: Provider.of<LanguageProvider>(context).languageData[
onPressed: () {}, Provider.of<LanguageProvider>(context).language]
label: const Text( ["navBar"]["3"],
"Absenden", ),
style: TextStyle(fontSize: 20), GButton(
icon: Icons.grass,
text: Provider.of<LanguageProvider>(context).languageData[
Provider.of<LanguageProvider>(context).language]
["navBar"]["4"],
),
],
), ),
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: const [
GButton(
icon: Icons.fastfood_outlined,
text: "Essen",
),
GButton(
icon: Icons.chair, /* prev: landscape*/
text: "Ambiente",
),
GButton(
icon: Icons.mood,
text: "Service",
),
GButton(
icon: Icons.feedback,
text: "Anmerkungen",
),
GButton(
icon: Icons.grass,
text: "Spezielle Ernährung",
),
],
), ),
), ),
), );
); });
} }
} }