From 9a737c2328a76c6f8715b7bff902404d552fd10d Mon Sep 17 00:00:00 2001 From: Ali Date: Sat, 23 Nov 2024 19:32:49 +0100 Subject: [PATCH] Pages Updated All Pages updated to the new Design Ambiente Icon Changes --- lib/main.dart | 2 +- lib/pages/pageAmbiente.dart | 163 ++++++++++++----------- lib/pages/pageAnmerkungen.dart | 166 ++++++++++++----------- lib/pages/pageEssen.dart | 175 ++++++++++++++----------- lib/pages/pageService.dart | 167 ++++++++++++----------- lib/pages/pageSpezielleErnaehrung.dart | 110 ++++++++++++++-- 6 files changed, 476 insertions(+), 307 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 5176890..ab2e6eb 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -246,7 +246,7 @@ class MyHome extends StatelessWidget { text: "Essen", ), GButton( - icon: Icons.landscape, + icon: Icons.chair, /* prev: landscape*/ text: "Ambiente", ), GButton( diff --git a/lib/pages/pageAmbiente.dart b/lib/pages/pageAmbiente.dart index 28abd95..886645d 100644 --- a/lib/pages/pageAmbiente.dart +++ b/lib/pages/pageAmbiente.dart @@ -9,81 +9,98 @@ class PageAmbiente extends StatelessWidget { @override Widget build(BuildContext context) { - return Center( - child: Container( - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage("assets/backgrounds/Ambiente.jpg"), - fit: BoxFit.cover, - colorFilter: ColorFilter.mode( - Colors.white.withOpacity(0.2), - BlendMode.dstATop + return Scaffold( + body: Stack( + children: [ + Container( + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/backgrounds/Ambiente.jpg"), + fit: BoxFit.cover, + colorFilter: ColorFilter.mode( + Colors.white.withOpacity(0.2), + BlendMode.dstATop + ), + ) + ), + ), + Center( + child: Container( + decoration: BoxDecoration( + color: Colors.white.withOpacity(0.8), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(80), + bottomRight: Radius.circular(80) + ) + ), + width: 600, + height: 400, + padding: EdgeInsets.symmetric(horizontal: 20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text( + "Frage1*", + style: TextStyle(fontSize: 35), + ), + Consumer( + builder: (context, essenProvider, child) { + return RatingStars(onRate: (value) { + essenProvider.setRatingFrage1(value); + }, initRating: essenProvider.ratingFrage1,); + }, + ) + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text( + "Frage2*", + style: TextStyle(fontSize: 35), + ), + Consumer( + builder: (context, essenProvider, child) { + return RatingStars(onRate: (value) { + essenProvider.setRatingFrage2(value); + }, initRating: essenProvider.ratingFrage2,); + }, + ) + ], + ), + const SizedBox( + height: 50, + ), + Consumer( + builder: (context, essenProvider, child) { + return TextFormField( + initialValue: essenProvider.freiText, + onChanged: (value) { + essenProvider.setFreiText(value); + }, + autofocus: false, + maxLength: 500, + maxLines: 4, + decoration: InputDecoration( + labelText: "Dein Feedback (optional)", + labelStyle: const TextStyle(fontSize: 20), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(15) + ), + ), + style: TextStyle(fontSize: 20), + ); + }, + ) + ], + ), ), ) - ), - width: 600, - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - const Text( - "Frage1*", - style: TextStyle(fontSize: 35), - ), - Consumer( - builder: (context, essenProvider, child) { - return RatingStars(onRate: (value) { - essenProvider.setRatingFrage1(value); - }, initRating: essenProvider.ratingFrage1,); - }, - ) - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - const Text( - "Frage2*", - style: TextStyle(fontSize: 35), - ), - Consumer( - builder: (context, essenProvider, child) { - return RatingStars(onRate: (value) { - essenProvider.setRatingFrage2(value); - }, initRating: essenProvider.ratingFrage2,); - }, - ) - ], - ), - const SizedBox( - height: 50, - ), - Consumer( - builder: (context, essenProvider, child) { - return TextFormField( - initialValue: essenProvider.freiText, - onChanged: (value) { - essenProvider.setFreiText(value); - }, - autofocus: false, - maxLength: 500, - maxLines: 4, - decoration: InputDecoration( - labelText: "Dein Feedback (optional)", - labelStyle: const TextStyle(fontSize: 20), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(15) - ), - ), - style: TextStyle(fontSize: 20), - ); - }, - ) - ], - ), + ], ), ); } diff --git a/lib/pages/pageAnmerkungen.dart b/lib/pages/pageAnmerkungen.dart index 94c7135..6460322 100644 --- a/lib/pages/pageAnmerkungen.dart +++ b/lib/pages/pageAnmerkungen.dart @@ -9,81 +9,99 @@ class PageAnmerkungen extends StatelessWidget { @override Widget build(BuildContext context) { - return Center( - child: Container( - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage("assets/backgrounds/Anmerkungen.jpg"), - fit: BoxFit.cover, - colorFilter: ColorFilter.mode( - Colors.white.withOpacity(0.2), - BlendMode.dstATop - ), - ) - ), - width: 600, - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - const Text( - "Frage1*", - style: TextStyle(fontSize: 35), - ), - Consumer( - builder: (context, essenProvider, child) { - return RatingStars(onRate: (value) { - essenProvider.setRatingFrage1(value); - }, initRating: essenProvider.ratingFrage1,); - }, - ) - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - const Text( - "Frage2*", - style: TextStyle(fontSize: 35), - ), - Consumer( - builder: (context, essenProvider, child) { - return RatingStars(onRate: (value) { - essenProvider.setRatingFrage2(value); - }, initRating: essenProvider.ratingFrage2,); - }, - ) - ], - ), - const SizedBox( - height: 50, - ), - Consumer( - builder: (context, essenProvider, child) { - return TextFormField( - initialValue: essenProvider.freiText, - onChanged: (value) { - essenProvider.setFreiText(value); - }, - autofocus: false, - maxLength: 500, - maxLines: 4, - decoration: InputDecoration( - labelText: "Dein Feedback (optional)", - labelStyle: const TextStyle(fontSize: 20), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(15) - ), + return Scaffold( + body: Stack( + children: [ + Container( + width: 1600, + height: 800, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/backgrounds/Anmerkungen.jpg"), + fit: BoxFit.cover, + colorFilter: ColorFilter.mode( + Colors.white.withOpacity(0.2), + BlendMode.dstATop ), - style: TextStyle(fontSize: 20), - ); - }, - ) - ], - ), + ) + ), + ), + Center( + child: Container( + decoration: BoxDecoration( + color: Colors.white.withOpacity(0.8), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(80), + bottomRight: Radius.circular(80) + ) + ), + padding: EdgeInsets.symmetric(horizontal: 20), + height: 400, + width: 600, + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text( + "Frage1*", + style: TextStyle(fontSize: 35), + ), + Consumer( + builder: (context, essenProvider, child) { + return RatingStars(onRate: (value) { + essenProvider.setRatingFrage1(value); + }, initRating: essenProvider.ratingFrage1,); + }, + ) + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text( + "Frage2*", + style: TextStyle(fontSize: 35), + ), + Consumer( + builder: (context, essenProvider, child) { + return RatingStars(onRate: (value) { + essenProvider.setRatingFrage2(value); + }, initRating: essenProvider.ratingFrage2,); + }, + ) + ], + ), + const SizedBox( + height: 50, + ), + Consumer( + builder: (context, essenProvider, child) { + return TextFormField( + initialValue: essenProvider.freiText, + onChanged: (value) { + essenProvider.setFreiText(value); + }, + autofocus: false, + maxLength: 500, + maxLines: 4, + decoration: InputDecoration( + labelText: "Dein Feedback (optional)", + labelStyle: const TextStyle(fontSize: 20), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(15) + ), + ), + style: TextStyle(fontSize: 20), + ); + }, + ) + ], + ), + ), + )], ), ); } diff --git a/lib/pages/pageEssen.dart b/lib/pages/pageEssen.dart index 14b4918..deb1292 100644 --- a/lib/pages/pageEssen.dart +++ b/lib/pages/pageEssen.dart @@ -10,81 +10,108 @@ class PageEssen extends StatelessWidget { @override Widget build(BuildContext context) { - return Center( - child: Container( - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage("assets/backgrounds/Essen.jpg"), - fit: BoxFit.cover, - colorFilter: ColorFilter.mode( - Colors.white.withOpacity(0.2), - BlendMode.dstATop - ), - ) - ), - width: 600, - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - const Text( - "Geschmack*", - style: TextStyle(fontSize: 35), - ), - Consumer( - builder: (context, essenProvider, child) { - return RatingStars(onRate: (value) { - essenProvider.setRatingGeschmack(value); - }, initRating: essenProvider.ratingGeschmack,); - }, - ) - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - const Text( - "Qualität*", - style: TextStyle(fontSize: 35), - ), - Consumer( - builder: (context, essenProvider, child) { - return RatingStars(onRate: (value) { - essenProvider.setRatingQuali(value); - }, initRating: essenProvider.ratingQuali,); - }, - ) - ], - ), - const SizedBox( - height: 50, - ), - Consumer( - builder: (context, essenProvider, child) { - return TextFormField( - initialValue: essenProvider.freiText, - onChanged: (value) { - essenProvider.setFreiText(value); - }, - autofocus: false, - maxLength: 500, - maxLines: 4, - decoration: InputDecoration( - labelText: "Dein Feedback (optional)", - labelStyle: const TextStyle(fontSize: 20), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(15) - ), + return Scaffold( + body: Stack( + children: [ + // Hintergrundbild + Container( + width: 1600, + height: 750, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/backgrounds/Essen.jpg"), + fit: BoxFit.cover, // Deckt den gesamten Bildschirm ab + colorFilter: ColorFilter.mode( + Colors.white.withOpacity(0.2), + BlendMode.dstATop, ), - style: TextStyle(fontSize: 20), - ); - }, - ) - ], - ), + ), + ), + ), + // Vordergrundinhalte + Center( + child: Container( + decoration: BoxDecoration( + color: Colors.white.withOpacity(0.8), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(80), + bottomRight: Radius.circular(80) + ) + ), + height: 400, + width: 600, + padding: EdgeInsets.symmetric(horizontal: 20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text( + "Geschmack*", + style: TextStyle(fontSize: 35), + ), + Consumer( + builder: (context, essenProvider, child) { + return RatingStars( + onRate: (value) { + essenProvider.setRatingGeschmack(value); + }, + initRating: essenProvider.ratingGeschmack, + ); + }, + ) + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text( + "Qualität*", + style: TextStyle(fontSize: 35), + ), + Consumer( + builder: (context, essenProvider, child) { + return RatingStars( + onRate: (value) { + essenProvider.setRatingQuali(value); + }, + initRating: essenProvider.ratingQuali, + ); + }, + ) + ], + ), + const SizedBox( + height: 50, + ), + Consumer( + builder: (context, essenProvider, child) { + return TextFormField( + initialValue: essenProvider.freiText, + onChanged: (value) { + essenProvider.setFreiText(value); + }, + autofocus: false, + maxLength: 500, + maxLines: 4, + decoration: InputDecoration( + labelText: "Dein Feedback (optional)", + labelStyle: const TextStyle(fontSize: 20), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(15), + ), + ), + style: TextStyle(fontSize: 20), + ); + }, + ), + ], + ), + ), + ), + ], ), ); } diff --git a/lib/pages/pageService.dart b/lib/pages/pageService.dart index 1894d66..857b896 100644 --- a/lib/pages/pageService.dart +++ b/lib/pages/pageService.dart @@ -9,81 +9,100 @@ class PageService extends StatelessWidget { @override Widget build(BuildContext context) { - return Center( - child: Container( - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage("assets/backgrounds/Service.jpg"), - fit: BoxFit.cover, - colorFilter: ColorFilter.mode( - Colors.white.withOpacity(0.2), - BlendMode.dstATop - ), - ) - ), - width: 600, - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - const Text( - "Frage1*", - style: TextStyle(fontSize: 35), - ), - Consumer( - builder: (context, essenProvider, child) { - return RatingStars(onRate: (value) { - essenProvider.setRatingFrage1(value); - }, initRating: essenProvider.ratingFrage1,); - }, - ) - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - const Text( - "Frage2*", - style: TextStyle(fontSize: 35), - ), - Consumer( - builder: (context, essenProvider, child) { - return RatingStars(onRate: (value) { - essenProvider.setRatingFrage2(value); - }, initRating: essenProvider.ratingFrage2,); - }, - ) - ], - ), - const SizedBox( - height: 50, - ), - Consumer( - builder: (context, essenProvider, child) { - return TextFormField( - initialValue: essenProvider.freiText, - onChanged: (value) { - essenProvider.setFreiText(value); - }, - autofocus: false, - maxLength: 500, - maxLines: 4, - decoration: InputDecoration( - labelText: "Dein Feedback (optional)", - labelStyle: const TextStyle(fontSize: 20), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(15) - ), + return Scaffold( + body: Stack( + children: [ + Container( + width: 1600, + height: 750, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/backgrounds/Service.jpg"), + fit: BoxFit.cover, + colorFilter: ColorFilter.mode( + Colors.white.withOpacity(0.2), + BlendMode.dstATop ), - style: TextStyle(fontSize: 20), - ); - }, - ) - ], - ), + ) + ), + ), + Center( + child: Container( + decoration: BoxDecoration( + color: Colors.white.withOpacity(0.8), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(80), + bottomRight: Radius.circular(80) + ) + ), + width: 600, + height: 400, + padding: EdgeInsets.symmetric(horizontal: 20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text( + "Frage1*", + style: TextStyle(fontSize: 35), + ), + Consumer( + builder: (context, essenProvider, child) { + return RatingStars(onRate: (value) { + essenProvider.setRatingFrage1(value); + }, initRating: essenProvider.ratingFrage1,); + }, + ) + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text( + "Frage2*", + style: TextStyle(fontSize: 35), + ), + Consumer( + builder: (context, essenProvider, child) { + return RatingStars(onRate: (value) { + essenProvider.setRatingFrage2(value); + }, initRating: essenProvider.ratingFrage2,); + }, + ) + ], + ), + const SizedBox( + height: 50, + ), + Consumer( + builder: (context, essenProvider, child) { + return TextFormField( + initialValue: essenProvider.freiText, + onChanged: (value) { + essenProvider.setFreiText(value); + }, + autofocus: false, + maxLength: 500, + maxLines: 4, + decoration: InputDecoration( + labelText: "Dein Feedback (optional)", + labelStyle: const TextStyle(fontSize: 20), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(15) + ), + ), + style: TextStyle(fontSize: 20), + ); + }, + ) + ], + ), + ), + ) + ], ), ); } diff --git a/lib/pages/pageSpezielleErnaehrung.dart b/lib/pages/pageSpezielleErnaehrung.dart index 676c331..801d156 100644 --- a/lib/pages/pageSpezielleErnaehrung.dart +++ b/lib/pages/pageSpezielleErnaehrung.dart @@ -11,18 +11,106 @@ class PageSpezielleErnaehrung extends StatelessWidget { @override Widget build(BuildContext context) { - return Center( - child: Container( - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage("assets/backgrounds/Speziell.jpg"), - fit: BoxFit.cover, - colorFilter: ColorFilter.mode( - Colors.white.withOpacity(0.2), - BlendMode.dstATop + return Scaffold( + body: Stack( + children: [ + Container( + width: 1600, + height: 750, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage("assets/backgrounds/Speziell.jpg"), + fit: BoxFit.cover, + colorFilter: ColorFilter.mode( + Colors.white.withOpacity(0.2), + BlendMode.dstATop + ), + ) + ), + ), + Center( + child: Container( + decoration: BoxDecoration( + color: Colors.white.withOpacity(0.8), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(80), + bottomRight: Radius.circular(80) + ) ), - ) - ), + width: 650, + height: 450, + padding: EdgeInsets.symmetric(horizontal: 20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text( + "Vegan?*", + style: TextStyle(fontSize: 35), + ), + Consumer( + builder: (context, spezielleErnaehrungProvider, child) { + return RatingStars(onRate: (value) { + spezielleErnaehrungProvider.setRatingSitzmoeglichkeit(value); + }, initRating: spezielleErnaehrungProvider.ratingSitzmoeglichkeit,); + }, + ) + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + const Text( + "Keine Ahnung*", + style: TextStyle(fontSize: 35), + ), + Consumer( + builder: (context, spezielleErnaehrungProvider, child) { + return RatingStars(onRate: (value) { + spezielleErnaehrungProvider.setRatingKeineAhnung(value); + }, initRating: spezielleErnaehrungProvider.ratingKeineAhnung,); + }, + ), + + ], + ), + const SizedBox( + height: 50, + ), + Consumer( + builder: (context, spezielleErnaehrungProvider, child) { + return TextFormField( + initialValue: spezielleErnaehrungProvider.freiText, + onChanged: (value) { + spezielleErnaehrungProvider.setFreiText(value); + }, + autofocus: false, + maxLength: 500, + maxLines: 5, + decoration: InputDecoration( + labelText: "Dein Feedback (optional)", + labelStyle: const TextStyle(fontSize: 20), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(15) + ), + ), + style: TextStyle(fontSize: 20), + ); + }, + ) + ], + ), + ), + ) + ], + ), + ); + + Center( + child: Container( width: 800, child: Column( crossAxisAlignment: CrossAxisAlignment.center,